diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2012-10-03 12:17:39 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-10-03 12:17:39 +0400 |
| commit | c1676e1f3b5154ae8705a14a1523f612c4a4290d (patch) | |
| tree | 514a55c7a5ca870980d4d8e36b60af1b691f520a | |
| parent | e0ce2c94ce5e5ec6cc2c22632f8664fd733dafca (diff) | |
| download | cibs-c1676e1f3b5154ae8705a14a1523f612c4a4290d.tar.gz | |
Carefully track proto dirs
| -rw-r--r-- | rules/32.mk | 2 | ||||
| -rw-r--r-- | rules/64.mk | 2 | ||||
| -rw-r--r-- | rules/ips.mk | 15 | ||||
| -rw-r--r-- | rules/noarch.mk | 2 |
4 files changed, 9 insertions, 12 deletions
diff --git a/rules/32.mk b/rules/32.mk index a105f9c..907f90f 100644 --- a/rules/32.mk +++ b/rules/32.mk @@ -27,6 +27,8 @@ build-stamp : build-32-stamp configure-stamp : configure-32-stamp install-stamp : install-32-stamp +protodirs += $(destdir.32) + %-32-stamp: bits = 32 __32_mk := included diff --git a/rules/64.mk b/rules/64.mk index 580fa30..81c7390 100644 --- a/rules/64.mk +++ b/rules/64.mk @@ -27,6 +27,8 @@ build-stamp : build-64-stamp configure-stamp : configure-64-stamp install-stamp : install-64-stamp +protodirs += $(destdir.64) + %-64-stamp: bits = 64 __64_mk := included diff --git a/rules/ips.mk b/rules/ips.mk index f302aec..734b173 100644 --- a/rules/ips.mk +++ b/rules/ips.mk @@ -47,9 +47,7 @@ pkg-define += \ # Where to find files: -pkg-protos = -d "$(destdir.32)" -pkg-protos += -d "$(destdir.64)" -pkg-protos += -d "$(destdir.noarch)" +pkg-protos = $(protodirs:%=-d "%") pkg-protos += -d "$(sourcedir)" -d . transformations := \ @@ -91,15 +89,8 @@ mogrify-stamp: $(mogrified-manifests) touch $@ -# pkgdepend is unhappy if some proto dirs do not exist: -protodirs-stamp: - [ -d "$(destdir.32)" ] || mkdir -p "$(destdir.32)" - [ -d "$(destdir.64)" ] || mkdir -p "$(destdir.64)" - [ -d "$(destdir.noarch)" ] || mkdir -p "$(destdir.noarch)" - touch $@ - depend-manifests := $(manifests:%=$(manifestdir)/depend-%) -$(manifestdir)/depend-% : $(manifestdir)/mogrified-% protodirs-stamp +$(manifestdir)/depend-% : $(manifestdir)/mogrified-% pkgdepend generate -m $(pkg-protos) $< > $@ || (rm -f $@; false) depend-stamp: $(depend-manifests) touch $@ @@ -116,7 +107,7 @@ resolve-stamp: $(resolved-manifests) # For convenience - make all, before publishing pre-publish: resolve-stamp -publish-stamp: pre-publish protodirs-stamp +publish-stamp: pre-publish @if [ -n "$(ips-repo)" ]; then \ set -x; \ for m in $(resolved-manifests); do \ diff --git a/rules/noarch.mk b/rules/noarch.mk index 00ae3a2..92103fa 100644 --- a/rules/noarch.mk +++ b/rules/noarch.mk @@ -27,6 +27,8 @@ 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 |