aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2005-11-12 19:28:46 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2005-11-12 19:28:46 +0000
commit0f8bb094ff6089e4bfa264b7024c9e78e6938e97 (patch)
tree56415f2a67e8fd97cab0a272349ddcf0f665e647
parent28b6aa4a8482b6ae7d025f91caebcf7c3b7eabc8 (diff)
downloadsrc-0f8bb094ff6089e4bfa264b7024c9e78e6938e97.tar.gz
src-0f8bb094ff6089e4bfa264b7024c9e78e6938e97.zip
Don't check DESTDIR when making distributeworld; the latter expects
DISTDIR. Reported by: nyan
Notes
Notes: svn path=/head/; revision=152338
-rw-r--r--Makefile.inc12
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 3ebeadd9becb..e3cb6f423972 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -484,6 +484,7 @@ SPECIAL_INSTALLCHECKS=
# Require DESTDIR to be set if installing for a different architecture.
#
.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE}
+.if !make(distributeworld)
SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR
installcheck_DESTDIR:
.if !defined(DESTDIR) || empty(DESTDIR)
@@ -491,6 +492,7 @@ installcheck_DESTDIR:
false
.endif
.endif
+.endif
#
# installcheck