From 070931e05c623cec18560c22f52c010838929406 Mon Sep 17 00:00:00 2001
From: Igor Pashev <igor.pashev@nexenta.com>
Date: Fri, 26 Oct 2012 15:14:12 +0400
Subject: Automatically define proto dirs

---
 rules/32.mk        | 2 --
 rules/64.mk        | 2 --
 rules/autotools.mk | 2 +-
 rules/common.mk    | 5 +++--
 rules/noarch.mk    | 2 --
 5 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'rules')

diff --git a/rules/32.mk b/rules/32.mk
index 4e32741..cb94b2a 100644
--- a/rules/32.mk
+++ b/rules/32.mk
@@ -31,8 +31,6 @@ build-stamp     : build-32-stamp
 configure-stamp : configure-32-stamp
 install-stamp   : install-32-stamp
 
-protodirs += $(destdir.32)
-
 %-32-stamp: bits = 32
 
 # build32 = \#, not it is emtpy and lines like
diff --git a/rules/64.mk b/rules/64.mk
index ca13218..ae826a5 100644
--- a/rules/64.mk
+++ b/rules/64.mk
@@ -31,8 +31,6 @@ build-stamp     : build-64-stamp
 configure-stamp : configure-64-stamp
 install-stamp   : install-64-stamp
 
-protodirs += $(destdir.64)
-
 %-64-stamp: bits = 64
 
 # build64 = \#, not it is emtpy and lines like
diff --git a/rules/autotools.mk b/rules/autotools.mk
index 75a5408..fd59ff3 100644
--- a/rules/autotools.mk
+++ b/rules/autotools.mk
@@ -59,7 +59,7 @@ build-%-stamp: configure-%-stamp
 	touch $@
 
 install-%-stamp: build-%-stamp
-	cd "$(builddir)" && $(MAKE) install DESTDIR="$(destdir)"
+	cd "$(builddir)" && $(MAKE) install DESTDIR="$(protodir)"
 	touch $@
 
 
diff --git a/rules/common.mk b/rules/common.mk
index ee16440..150906a 100644
--- a/rules/common.mk
+++ b/rules/common.mk
@@ -43,9 +43,10 @@ mach64 := amd64
 variants :=
 
 define add-variant
-destdir.$1 = $(workdir)/proto/$1
+protodir.$1 = $(workdir)/proto/$1
 builddir.$1 = $(workdir)/build/$1
 variants += $1
+protodirs += $(protodir.$1)
 endef
 
 workdir   := $(CURDIR)/work
@@ -81,7 +82,7 @@ includedir = $(includedir.$(bits))
 CC         = $(CC.$(bits))
 CXX        = $(CXX.$(bits))
 builddir   = $(builddir.$(bits))
-destdir    = $(destdir.$(bits))
+protodir   = $(protodir.$(bits))
 
 
 
diff --git a/rules/noarch.mk b/rules/noarch.mk
index e22d9be..8c80257 100644
--- a/rules/noarch.mk
+++ b/rules/noarch.mk
@@ -31,8 +31,6 @@ build-stamp     : build-noarch-stamp
 configure-stamp : configure-noarch-stamp
 install-stamp   : install-noarch-stamp
 
-protodirs += $(destdir.noarch)
-
 %-noarch-stamp: bits = noarch
 
 __noarch_mk := included
-- 
cgit v1.2.3