From owner-freebsd-hackers  Thu Mar 26 12:32:37 1998
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id MAA17633
          for freebsd-hackers-outgoing; Thu, 26 Mar 1998 12:32:37 -0800 (PST)
          (envelope-from owner-freebsd-hackers@FreeBSD.ORG)
Received: from ns1.yes.no (ns1.yes.no [195.119.24.10])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id MAA17598
          for <freebsd-hackers@FreeBSD.ORG>; Thu, 26 Mar 1998 12:32:20 -0800 (PST)
          (envelope-from eivind@bitbox.follo.net)
Received: from bitbox.follo.net (bitbox.follo.net [194.198.43.36])
	by ns1.yes.no (8.8.7/8.8.7) with ESMTP id UAA11850;
	Thu, 26 Mar 1998 20:32:12 GMT
Received: (from eivind@localhost)
	by bitbox.follo.net (8.8.6/8.8.6) id VAA11849;
	Thu, 26 Mar 1998 21:32:05 +0100 (MET)
Message-ID: <19980326213205.04948@follo.net>
Date: Thu, 26 Mar 1998 21:32:05 +0100
From: Eivind Eklund <eivind@yes.no>
To: am@f1.ru
Cc: freebsd-hackers@FreeBSD.ORG
Subject: Re: list of install exclusions for `make world'
References: <19980325213106.34958@follo.net> <199803261204.PAA09236@px.f1.ru> <19980326151528.46729@follo.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 0.89.1i
In-Reply-To: <19980326151528.46729@follo.net>; from Eivind Eklund on Thu, Mar 26, 1998 at 03:15:28PM +0100
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

On Thu, Mar 26, 1998 at 03:15:28PM +0100, Eivind Eklund wrote:
> > But of course if you are planning to do something more universal - it
> > would be nice. What is estimate time to release some kind of `alpha'?
> 
> Unknown, since the total amount of work in what I'm doing is about
> three hours, including testing.  It is just a question of taking that
> time :-)  If you need it, I can try to have it ready by monday.

Following up on my own comment: Here are the patches.  It's not quite
monday yet, but these aren't heavily tested yet, so it probably won't
be in the tree before monday anyway.

Feedback (both negative and positive) welcome.

Eivind.

Index: bsd.subdir.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.subdir.mk,v
retrieving revision 1.22
diff -u -r1.22 bsd.subdir.mk
--- bsd.subdir.mk	1998/03/26 16:02:44	1.22
+++ bsd.subdir.mk	1998/03/26 20:20:25
@@ -20,6 +20,13 @@
 #		Each of the targets will execute the same target in the
 #		subdirectories.
 #
+# SDIR_OVERRIDE A directory-tree that contains overrides for
+#               corresponding build subdirs.
+#		Each override is a file containing one subdirname per line:
+#                  'subdirlist'  is a pure override
+#		   'subdirdrop'  removes directories from the build
+#		   'subdiradd'   adds directories to the build
+#
 # +++ targets +++
 #
 #	distribute:
@@ -34,9 +41,21 @@
 
 .MAIN: all
 
+.if exists(${SDIR_OVERRIDE}/${DIRPRFX}/subdirlist)
+SUBDIR!=cat ${SDIR_OVERRIDE}/${DIRPRFX}/subdirlist
+.endif
+
+.if exists(${SDIR_OVERRIDE}/${DIRPRFX}/subdiradd)
+_SUBDIR_EXTRA!=cat ${SDIR_OVERRIDE}/${DIRPRFX}/subdiradd
+.endif
+
 _SUBDIRUSE: .USE
-	@for entry in ${SUBDIR}; do \
-		(if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
+	@for entry in ${SUBDIR} ${_SUBDIR_EXTRA}; do \
+		(if ! (test -f ${SDIR_OVERRIDE}/${DIRPRFX}/subdirdrop && \
+			grep -w $${entry} \
+				${SDIR_OVERRIDE}/${DIRPRFX}/subdirdrop \
+				> /dev/null); then \
+		if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
 			${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE}"; \
 			edir=$${entry}.${MACHINE}; \
 			cd ${.CURDIR}/$${edir}; \
@@ -44,8 +63,12 @@
 			${ECHODIR} "===> ${DIRPRFX}$$entry"; \
 			edir=$${entry}; \
 			cd ${.CURDIR}/$${edir}; \
+		fi; \
+		${MAKE} ${.TARGET:realinstall=install} \
+			SDIR_OVERRIDE=${SDIR_OVERRIDE} \
+			DIRPRFX=${DIRPRFX}$$edir/; \
 		fi; \
-		${MAKE} ${.TARGET:realinstall=install} DIRPRFX=${DIRPRFX}$$edir/); \
+		); \
 	done
 
 ${SUBDIR}::

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message