From 7b73495e0ec773319cd2073f4bdc1505da8dc16d Mon Sep 17 00:00:00 2001
From: Philip Guenthe <guenther@cvs.openbsd.org>
Date: Sun, 24 Apr 2011 22:04:44 +0000
Subject: Head off attempts to do 'make build' with DESTDIR set, as it doesn't
 work

ok sthen@, deraadt@
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 \
-- 
cgit v1.2.3