summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-05-21 19:41:16 +0000
committerjkh <jkh@FreeBSD.org>1997-05-21 19:41:16 +0000
commitd43e1786045e14314f0ec3fd72f8f6a645926ab3 (patch)
treea38bb929617f88b18d7cdfc9ba16bd4595dc1d04
parent2719fbb4b603fb9251dbc32978a303b82c4b3218 (diff)
downloadFreeBSD-src-d43e1786045e14314f0ec3fd72f8f6a645926ab3.zip
FreeBSD-src-d43e1786045e14314f0ec3fd72f8f6a645926ab3.tar.gz
Remove evil MAKE_LOCAL and MAKE_PORTS hacks and replace them with
a simpler, more general LOCAL_DIRS hack. Reviewed by: asami
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index d7fa5ac..6b55628 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
#
-# $Id: Makefile,v 1.124 1997/05/10 06:53:40 bde Exp $
+# $Id: Makefile,v 1.125 1997/05/13 18:11:38 peter Exp $
#
# Make command line options:
# -DCLOBBER will remove /usr/include
-# -DMAKE_LOCAL to add ./local to the SUBDIR list
-# -DMAKE_PORTS to add ./ports to the SUBDIR list
+# -DLOCAL_DIRS to add additional dirs to the SUBDIR list
# -DMAKE_EBONES to build eBones (KerberosIV)
# -DALLLANG to build documentation for all languages
# (where available -- see share/doc/Makefile)
@@ -98,11 +97,12 @@ SUBDIR+= etc
# These are last, since it is nice to at least get the base system
# rebuilt before you do them.
-.if defined(MAKE_LOCAL) & exists(local) & exists(local/Makefile)
-SUBDIR+= local
+.if defined(LOCAL_DIRS)
+.for _DIR in ${LOCAL_DIRS}
+.if exists(${_DIR}) & exists(${_DIR}/Makefile)
+SUBDIR+= ${_DIR}
.endif
-.if defined(MAKE_PORTS) & exists(ports) & exists(ports/Makefile)
-SUBDIR+= ports
+.endfor
.endif
# Handle -DNOOBJDIR, -DNOCLEAN and -DNOCLEANDIR
OpenPOWER on IntegriCloud