summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Guenthe <guenther@cvs.openbsd.org>2011-04-24 22:04:44 +0000
committerPhilip Guenthe <guenther@cvs.openbsd.org>2011-04-24 22:04:44 +0000
commit7b73495e0ec773319cd2073f4bdc1505da8dc16d (patch)
tree8dbc5559db24e396686ea3fb8d4edc9a8750fe76
parent4f40f538b04f7436846eac16078ad300416dc615 (diff)
Head off attempts to do 'make build' with DESTDIR set, as it doesn't work
ok sthen@, deraadt@
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ae216f21d43..34c3ab5d70f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.115 2010/03/23 21:31:02 espie Exp $
+# $OpenBSD: Makefile,v 1.116 2011/04/24 22:04:43 guenther Exp $
#
# For more information on building in tricky environments, please see
@@ -67,6 +67,11 @@ afterinstall:
cd ${.CURDIR}/share/man && exec ${MAKE} makedb
.endif
+.ifdef DESTDIR
+build:
+ @echo cannot build with DESTDIR set
+ @false
+.else
build:
.ifdef GLOBAL_AUTOCONF_CACHE
cp /dev/null ${GLOBAL_AUTOCONF_CACHE}
@@ -79,6 +84,7 @@ build:
cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
NOMAN=1 exec ${SUDO} ${MAKE} install
${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
+.endif
CROSS_TARGETS=cross-env cross-dirs cross-obj cross-includes cross-binutils \
cross-gcc cross-tools cross-lib cross-bin cross-etc-root-var \