summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark J. Nelson <Mark.J.Nelson@Sun.COM>2009-03-16 18:11:39 -0600
committerMark J. Nelson <Mark.J.Nelson@Sun.COM>2009-03-16 18:11:39 -0600
commite6b247f0dcf4dd97826a5d2275264e2692800517 (patch)
treeeccafc61d52ed7670eacf587db0a4e5ef1ee1e04
parent2baa66a090105c68f5f57d75153a2aaafdbe8536 (diff)
downloadillumos-gate-e6b247f0dcf4dd97826a5d2275264e2692800517.tar.gz
6815619 More informative error when SCM_TYPE is not set
-rw-r--r--usr/src/pkgdefs/Makefile.targ8
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/pkgdefs/Makefile.targ b/usr/src/pkgdefs/Makefile.targ
index cb1a0798ba..da1fbc61d2 100644
--- a/usr/src/pkgdefs/Makefile.targ
+++ b/usr/src/pkgdefs/Makefile.targ
@@ -52,6 +52,14 @@ $(CHKINSTALL): $(PKGDEFS)/common_files/$(CHKINSTALLSRC)
# that will only be evaluated for the intended failure
# case.
#
+# The three "${TRUE}" macros cover the situations where SCM_TYPE
+# is not set (""), or it's set by nightly.sh for a tarball source
+# tree ("none"), or it's set by bldenv for a tarball source tree
+# ("unknown").
+#
+NOT_UNDER_=${TRUE}
+NOT_UNDER_none=${TRUE}
+NOT_UNDER_unknown=${TRUE}
NOT_UNDER_mercurial= \
( hg locate --include . $@ > /dev/null ; [ $$? != 0 ] )
NOT_UNDER_teamware=[ ! -f SCCS/s.$@ ]