aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/symlinks/Makefile4
-rw-r--r--rules/32.mk2
-rw-r--r--rules/64.mk2
-rw-r--r--rules/autotools.mk2
-rw-r--r--rules/common.mk5
-rw-r--r--rules/noarch.mk2
6 files changed, 6 insertions, 11 deletions
diff --git a/examples/symlinks/Makefile b/examples/symlinks/Makefile
index 7b78b60..c90184b 100644
--- a/examples/symlinks/Makefile
+++ b/examples/symlinks/Makefile
@@ -26,6 +26,6 @@ build-%-stamp: download-stamp patch-stamp
touch $@
install-%-stamp: build-%-stamp
- mkdir -p $(destdir)/$(bindir)
- cp $(builddir)/symlinks $(destdir)/$(bindir)
+ mkdir -p $(protodir)/$(bindir)
+ cp $(builddir)/symlinks $(protodir)/$(bindir)
touch $@
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