diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2012-09-14 12:54:48 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-09-14 12:54:48 +0400 |
| commit | 5648f54f90a6f2d0058d81df35000b0477d10f46 (patch) | |
| tree | 671b4deb2259239f69f68184f7bec81dd91dfe9e | |
| parent | c5abe7d73eca609b9f6e09b8eeb63f9bee4b1555 (diff) | |
| download | cibs-5648f54f90a6f2d0058d81df35000b0477d10f46.tar.gz | |
pre-publish target to allow final review
| -rw-r--r-- | rules/ips.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/rules/ips.mk b/rules/ips.mk index 6bd46c2..aaddf20 100644 --- a/rules/ips.mk +++ b/rules/ips.mk @@ -105,7 +105,11 @@ $(resolved-manifests): $(depend-manifests) resolve-stamp: $(resolved-manifests) touch $@ -publish-stamp: resolve-stamp + +# For convenience - make all, before publishing +pre-publish: resolve-stamp + +publish-stamp: pre-publish @if [ -n "$(ips-repo)" ]; then \ set -x; \ pkgsend -s $(ips-repo) publish --fmri-in-manifest \ @@ -127,7 +131,7 @@ check-build-dep-stamp: check-ips-build-dep-stamp # issue 'make d=' to skip dependency checking: check-ips-build-dep-stamp: d=true check-ips-build-dep-stamp: - [ -z "$d" ] || pkg list $(build-depends) + [ -z "$d" ] || [ -z "$(build-depends)" ] || pkg list $(build-depends) touch $@ @@ -135,7 +139,7 @@ check-ips-build-dep-stamp: build-dep: $(root) pkg install $(build-depends) -.PHONY: publish build-dep +.PHONY: publish build-dep pre-publish __ips_mk := included endif |