Change the distribute targets so that a given item in our source tree

can place itself into n distributions, where n >= 1.

7 files changed, 28 insertions, 15 deletions

diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index fc50d1c..dd6acd2 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.doc.mk	5.3 (Berkeley) 1/2/91
-#	$Id: bsd.doc.mk,v 1.36 1997/04/04 01:25:32 mpp Exp $
+#	$Id: bsd.doc.mk,v 1.37 1997/05/11 10:42:00 wosch Exp $
 #
 # The include file <bsd.doc.mk> handles installing BSD troff documents.
 # <bsd.prog.mk> includes the include files <bsd.dep.mk> and <bsd.obj.mk>.
@@ -124,7 +124,9 @@ afterinstall:
 DISTRIBUTION?=	doc
 .if !target(distribute)
 distribute:
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${DISTRIBUTION} SHARED=copies
+.for dist in ${DISTRIBUTION}
+	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
+.endfor
 .endif
 
 spell: ${SRCS}
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 67bedba..ab0e399 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.info.mk,v 1.38 1997/04/30 17:03:09 bde Exp $
+#	$Id: bsd.info.mk,v 1.39 1997/05/01 01:15:55 jkh Exp $
 #
 # The include file <bsd.info.mk> handles installing GNU (tech)info files.
 # Texinfo is a documentation system that uses a single source
@@ -141,8 +141,9 @@ DISTRIBUTION=	info
 
 .if !target(distribute)
 distribute: _SUBDIR
-	cd ${.CURDIR} ; \
-		$(MAKE) install DESTDIR=${DISTDIR}/${DISTRIBUTION} SHARED=copies
+.for dist in ${DISTRIBUTION}
+	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
+.endfor
 .endif
 
 .if defined(SRCS)
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index a02fdbb..71f0194 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.kmod.mk,v 1.36 1997/05/06 14:29:56 dfr Exp $
+#	$Id: bsd.kmod.mk,v 1.37 1997/06/18 03:10:31 asami Exp $
 #
 # The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
 # <bsd.kmod.mk> includes the file named "../Makefile.inc" if it exists,
@@ -200,7 +200,9 @@ realinstall: beforeinstall
 DISTRIBUTION?=	bin
 .if !target(distribute)
 distribute: _SUBDIR
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${DISTRIBUTION} SHARED=copies
+.for dist in ${DISTRIBUTION}
+	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
+.endfor
 .endif
 
 .if defined(NOTAGS)
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 4917efd..0fd7633 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-#	$Id: bsd.lib.mk,v 1.57 1997/05/23 17:50:35 dfr Exp $
+#	$Id: bsd.lib.mk,v 1.58 1997/06/18 03:39:34 asami Exp $
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -245,7 +245,9 @@ afterinstall: realinstall
 DISTRIBUTION?=	bin
 .if !target(distribute)
 distribute:	_SUBDIR
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${DISTRIBUTION} SHARED=copies
+.for dist in ${DISTRIBUTION}
+	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
+.endfor
 .endif
 
 .if !target(lint)
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index cc146d2..c892983 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.prog.mk,v 1.49 1997/04/23 18:47:42 bde Exp $
+#	$Id: bsd.prog.mk,v 1.50 1997/05/23 08:38:46 asami Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -112,7 +112,9 @@ afterinstall: realinstall
 DISTRIBUTION?=	bin
 .if !target(distribute)
 distribute: _SUBDIR
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${DISTRIBUTION} SHARED=copies
+.for dist in ${DISTRIBUTION}
+	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
+.endfor
 .endif
 
 .if !target(lint)
diff --git a/share/mk/bsd.sgml.mk b/share/mk/bsd.sgml.mk
index 7961b86..4292f89 100644
--- a/share/mk/bsd.sgml.mk
+++ b/share/mk/bsd.sgml.mk
@@ -1,7 +1,7 @@
 #       bsd.sgml.mk - 8 Sep 1995 John Fieber
 #       This file is in the public domain.
 #
-#	$Id: bsd.sgml.mk,v 1.18 1997/05/11 00:32:14 wosch Exp $
+#	$Id: bsd.sgml.mk,v 1.19 1997/05/25 12:43:06 wosch Exp $
 #
 # The include file <bsd.sgml.mk> handles installing sgml documents.
 # <bsd.prog.mk> includes the file named "../Makefile.inc" if it exists,
@@ -123,7 +123,9 @@ spell: ${SRCS}
 
 .if !target(distribute)
 distribute:
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${DISTRIBUTION} SHARED=copies
+.for dist in ${DISTRIBUTION}
+	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
+.endfor
 .endif
 
 # For each FORMATS type, define a build, install, clean and print target.
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index b815451..310c97a 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-#	$Id: bsd.subdir.mk,v 1.16 1997/03/31 05:30:16 scrappy Exp $
+#	$Id: bsd.subdir.mk,v 1.17 1997/04/13 06:44:24 jkh Exp $
 #
 # The include file <bsd.subdir.mk> contains the default targets
 # for building subdirectories. It has the same seven targets
@@ -104,5 +104,7 @@ afterdistribute:
 .endif
 .if !target(distribute)
 distribute: _SUBDIRUSE
-	cd ${.CURDIR} ; ${MAKE} afterdistribute DESTDIR=${DISTDIR}/${DISTRIBUTION}
+.for dist in ${DISTRIBUTION}
+	cd ${.CURDIR} ; ${MAKE} afterdistribute DESTDIR=${DISTDIR}/${dist}
+.endfor
 .endif