summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1994-11-13 21:05:28 +0000
committerphk <phk@FreeBSD.org>1994-11-13 21:05:28 +0000
commit94e55d40f9b03d80327a548eff1ab752ba9a6833 (patch)
tree1cbec4b01474ea978c3d3b8b85c006c6c1f77906 /share/mk
parent48bf3d3d0e0fc7b65115f13d2b9b422783fb9e41 (diff)
downloadFreeBSD-src-94e55d40f9b03d80327a548eff1ab752ba9a6833.zip
FreeBSD-src-94e55d40f9b03d80327a548eff1ab752ba9a6833.tar.gz
Add a new "distribute" target. This is a variant of install, which will
put the stuff into the right "distribution". As default things end up in "bindist". Normal (ie: most) makefiles know naught of this. More commits will follow, which will direct various parts of the tree into the distribution we want them in. Some of the grief of being release-engineer is supposed to go away with this.
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.doc.mk8
-rw-r--r--share/mk/bsd.kmod.mk8
-rw-r--r--share/mk/bsd.lib.mk8
-rw-r--r--share/mk/bsd.prog.mk8
-rw-r--r--share/mk/bsd.subdir.mk12
5 files changed, 39 insertions, 5 deletions
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 55552f6..81082ee 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.2 1994/08/04 21:09:22 wollman Exp $
+# $Id: bsd.doc.mk,v 1.3 1994/08/28 15:37:39 bde Exp $
PRINTER?= ps
@@ -76,6 +76,12 @@ install:
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${DOC}.* \
${DESTDIR}${BINDIR}/${VOLUME}
+DISTRIBUTION?= bindist
+.if !target(distribute)
+distribute:
+ cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies
+.endif
+
spell: ${SRCS}
(cd ${.CURDIR}; spell ${SRCS} ) | sort | \
comm -23 - ${.CURDIR}/spell.ok > ${DOC}.spell
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index a796dd6..ae2e07c 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.2 1994/09/21 03:49:59 wollman Exp $
+# $Id: bsd.kmod.mk,v 1.3 1994/09/26 22:34:04 wollman Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@@ -105,6 +105,12 @@ afterinstall: realinstall
realinstall: beforeinstall
.endif
+DISTRIBUTION?= bindist
+.if !target(distribute)
+distribute:
+ cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies
+.endif
+
.if !target(obj)
.if defined(NOOBJ)
obj: _PROGSUBDIR
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index f65dcd6..81a514c 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.9 1994/09/18 22:22:32 wollman Exp $
+# $Id: bsd.lib.mk,v 1.10 1994/10/25 17:55:25 bde Exp $
#
.if exists(${.CURDIR}/../Makefile.inc)
@@ -267,6 +267,12 @@ afterinstall: realinstall
.endif
.endif
+DISTRIBUTION?= bindist
+.if !target(distribute)
+distribute:
+ cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies
+.endif
+
.if !target(lint)
lint:
.endif
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 6fe4c87..044a6a2 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.10 1994/10/18 23:01:22 pst Exp $
+# $Id: bsd.prog.mk,v 1.11 1994/10/25 18:09:44 bde Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@@ -203,6 +203,12 @@ afterinstall: realinstall
realinstall: beforeinstall
.endif
+DISTRIBUTION?= bindist
+.if !target(distribute)
+distribute:
+ cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies
+.endif
+
.if !target(lint)
lint: ${SRCS} _PROGSUBDIR
.if defined(PROG)
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index b712afe..4ff74f6 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.3 1994/08/28 15:35:30 bde Exp $
+# $Id: bsd.subdir.mk,v 1.4 1994/09/16 14:30:25 jkh Exp $
.MAIN: all
@@ -53,6 +53,16 @@ depend: _SUBDIRUSE
maninstall: _SUBDIRUSE
.endif
+DISTRIBUTION?= bindist
+.if !target(afterdistribute)
+afterdistribute:
+.endif
+.if !target(distribute)
+distribute: _SUBDIRUSE
+ cd ${.CURDIR} ; ${MAKE} afterdistribute DESTDIR=${RELEASEDIR}/${DISTRIBUTION}
+
+.endif
+
.if !target(install)
.if !target(beforeinstall)
beforeinstall:
OpenPOWER on IntegriCloud