===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.112
retrieving revision 1.116
diff -u -r1.112 -r1.116
--- src/Makefile	2005/01/09 20:36:20	1.112
+++ src/Makefile	2011/04/24 22:04:43	1.116
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.112 2005/01/09 20:36:20 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
@@ -8,7 +8,8 @@
 # Building recommendations:
 #
 # 1) If at all possible, put this source tree in /usr/src.  If /usr/src
-# must be a symbolic link, setenv BSDSRCDIR to point to the real location.
+# must be a symbolic link, set BSDSRCDIR in the environment to point to
+# the real location.
 #
 # 2) It is also recommended that you compile with objects outside the
 # source tree. To do this, ensure /usr/obj exists or points to some
@@ -37,7 +38,7 @@
 SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share games
 SUBDIR+= gnu
 
-SUBDIR+= sys lkm
+SUBDIR+= sys
 
 .if (${KERBEROS5:L} == "yes")
 SUBDIR+= kerberosV
@@ -58,6 +59,7 @@
 
 beforeinstall:
 	cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} distrib-dirs
+	cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} install-mtree
 	cd ${.CURDIR}/include && exec ${MAKE} includes
 
 afterinstall:
@@ -65,7 +67,12 @@
 	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}
 .endif
@@ -77,6 +84,7 @@
 	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 \