Abuse bsd.obj.mk for defining default distribute target.

6 files changed, 10 insertions, 47 deletions

diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 0922c51..9f6e1fe 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -121,14 +121,6 @@ afterinstall:
 
 .endif
 
-DISTRIBUTION?=	doc
-.if !target(distribute)
-distribute:
-.for dist in ${DISTRIBUTION}
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
-.endfor
-.endif
-
 spell: ${SRCS}
 	(cd ${.CURDIR};  spell ${SRCS} ) | sort | \
 		comm -23 - ${.CURDIR}/spell.ok > ${DOC}.spell
@@ -155,4 +147,6 @@ ${DFILE}: ${SRCS} _stamp.extraobjs
 .endif
 .endif
 
+DISTRIBUTION?=	doc
+
 .include <bsd.obj.mk>
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index c4ce872..62f41c3 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -11,8 +11,6 @@
 #
 # DESTDIR	Change the tree where the info files gets installed. [not set]
 #
-# DISTRIBUTION	Name of distribution. [info]
-#
 # DVIPS		A program which convert a TeX DVI file to PostScript [dvips]
 #
 # DVIPS2ASCII	A program to convert a PostScript file which was prior
@@ -65,10 +63,6 @@
 #
 # +++ targets +++
 #
-#	distribute:
-#		This is a variant of install, which will
-#		put the stuff into the right "distribution".
-#
 #	install:
 #		Install the info files.
 #
@@ -159,15 +153,6 @@ ${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE}
 
 .PHONY: ${INSTALLINFODIRS}
 
-DISTRIBUTION?=	base
-
-.if !target(distribute)
-distribute:
-.for dist in ${DISTRIBUTION}
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
-.endfor
-.endif
-
 .if defined(SRCS)
 CLEANFILES+=	${INFO}.texi
 ${INFO}.texi: ${SRCS}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 7998ac8..e97ef34 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -354,14 +354,6 @@ afterinstall: maninstall
 .endif
 .endif
 
-DISTRIBUTION?=	base
-.if !target(distribute)
-distribute:
-.for dist in ${DISTRIBUTION}
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
-.endfor
-.endif
-
 .if !target(lint)
 lint: ${SRCS:M*.c}
 	${LINT} ${LINTOBJFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index 6d53f87..bbf481b 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -117,14 +117,6 @@ realinstall:	beforeinstall
 all:		all-nls
 install:	realinstall afterinstall
 
-DISTRIBUTION?=	base
-.if !target(distribute)
-distribute:
-.for dist in ${DISTRIBUTION}
-	cd ${.CURDIR}; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
-.endfor
-.endif
-
 .if !target(beforeinstall)
 beforeinstall:
 .endif
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index cbd033b..a8d0b1f 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -151,6 +151,14 @@ checkdpadd:
 
 cleandir: cleanobj
 
+DISTRIBUTION?=	base
+.if !target(distribute)
+distribute:
+.for dist in ${DISTRIBUTION}
+	cd ${.CURDIR}; ${MAKE} install DESTDIR=${DISTDIR}/${dist} SHARED=copies
+.endfor
+.endif
+
 .include <bsd.subdir.mk>
 
 .endif !target(__<bsd.obj.mk>__)
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 94d07da..f655c6e 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -205,14 +205,6 @@ afterinstall: maninstall
 .endif
 .endif
 
-DISTRIBUTION?=	base
-.if !target(distribute)
-distribute:
-.for dist in ${DISTRIBUTION}
-	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies
-.endfor
-.endif
-
 .if !target(lint)
 lint: ${SRCS}
 .if defined(PROG)