===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.115
retrieving revision 1.125
diff -u -r1.115 -r1.125
--- src/Makefile	2010/03/23 21:31:02	1.115
+++ src/Makefile	2015/08/23 14:22:56	1.125
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.115 2010/03/23 21:31:02 espie Exp $
+#	$OpenBSD: Makefile,v 1.125 2015/08/23 14:22:56 deraadt Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -25,8 +25,9 @@
 # 4) If you are reasonably sure that things will compile OK, use the
 # "make build" target supplied here. Good luck.
 #
-# 5) If you want to setup a cross-build environment, there is a "cross-tools"
-# target available which upon completion of "make TARGET=<target> cross-tools"
+# 5) If you want to setup a cross-build environment, there is a "cross-gcc"
+# target available which upon completion of: 
+#	"make -f Makefile.cross TARGET=<target> cross-gcc"
 # (where <target> is one of the names in the /sys/arch directory) will produce
 # a set of compilation tools along with the includes in the /usr/cross/<target>
 # directory. The "cross-distrib" target will build cross-tools as well as
@@ -40,19 +41,13 @@
 
 SUBDIR+= sys
 
-.if (${KERBEROS5:L} == "yes")
-SUBDIR+= kerberosV
-.endif
-
 .if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= distrib regress
+SUBDIR+= etc distrib regress
 .endif
 
-.if exists(regress)
 regression-tests:
 	@echo Running regression tests...
 	@cd ${.CURDIR}/regress && ${MAKE} depend && exec ${MAKE} regress
-.endif
 
 includes:
 	cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes
@@ -65,9 +60,15 @@
 afterinstall:
 .ifndef NOMAN
 	cd ${.CURDIR}/share/man && exec ${MAKE} makedb
+	cd ${.CURDIR}/distrib/sets && 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
@@ -79,6 +80,8 @@
 	cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
 	    NOMAN=1 exec ${SUDO} ${MAKE} install
 	${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
+	${SUDO} /bin/sh ${.CURDIR}/distrib/sets/makeetcset ${.CURDIR} ${MAKE}
+.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 \