From 030d01ab3c9b5a80069b0e938ae9ac0bbc210021 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Sat, 14 Jan 1995 07:51:10 +0000
Subject: [PATCH] Change DISTRIBUTION names.  Also make bsd.doc.mk go to doc
 distribution, not bin.  Hmmm.

---
 share/mk/bsd.doc.mk    | 4 ++--
 share/mk/bsd.info.mk   | 4 ++--
 share/mk/bsd.kmod.mk   | 4 ++--
 share/mk/bsd.lib.mk    | 4 ++--
 share/mk/bsd.prog.mk   | 4 ++--
 share/mk/bsd.subdir.mk | 4 ++--
 sys/conf/kmod.mk       | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index feedb8388cf6..91fed85f1b51 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.11 1995/01/11 02:41:09 wollman Exp $
+#	$Id: bsd.doc.mk,v 1.12 1995/01/11 19:58:03 wollman Exp $
 
 PRINTER?=	ps
 
@@ -106,7 +106,7 @@ afterinstall:
 
 .endif
 
-DISTRIBUTION?=	bindist
+DISTRIBUTION?=	doc
 .if !target(distribute)
 distribute:
 	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 3e918a62fbb4..6e0c60c725d1 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -1,4 +1,4 @@
-# $Id: bsd.info.mk,v 1.6 1995/01/12 08:20:25 jkh Exp $
+# $Id: bsd.info.mk,v 1.7 1995/01/12 08:21:31 jkh Exp $
 
 BINMODE=        444
 BINDIR?=	/usr/share/info
@@ -17,7 +17,7 @@ MAKEINFOFLAGS?=	# --no-split would simplify some things, e.g., compression
 
 all: ${INFO:S/$/.info/g}
 
-DISTRIBUTION?=	infodist
+DISTRIBUTION?=	info
 .if !target(distribute)
 distribute:     
 	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies     
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index c04895d5af03..afc27faa5339 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.5 1994/12/28 03:50:46 ache Exp $
+#	$Id: bsd.kmod.mk,v 1.6 1995/01/01 21:11:55 bde Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -101,7 +101,7 @@ afterinstall: realinstall
 realinstall: beforeinstall
 .endif
 
-DISTRIBUTION?=	bindist
+DISTRIBUTION?=	bin
 .if !target(distribute)
 distribute:
 	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 0767cd118c7d..ab52fe2fb972 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.16 1994/12/28 00:49:58 ache Exp $
+#	$Id: bsd.lib.mk,v 1.17 1995/01/04 22:32:40 ache Exp $
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -279,7 +279,7 @@ afterinstall: realinstall
 .endif
 .endif
 
-DISTRIBUTION?=	bindist
+DISTRIBUTION?=	bin
 .if !target(distribute)
 distribute:
 	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 51381b141383..e922d3443d92 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.14 1994/12/22 17:20:52 bde Exp $
+#	$Id: bsd.prog.mk,v 1.15 1994/12/28 03:50:58 ache Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -177,7 +177,7 @@ afterinstall: realinstall
 realinstall: beforeinstall
 .endif
 
-DISTRIBUTION?=	bindist
+DISTRIBUTION?=	bin
 .if !target(distribute)
 distribute:
 	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 4ff74f63d653..c7ea061f94ca 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.4 1994/09/16 14:30:25 jkh Exp $
+#	$Id: bsd.subdir.mk,v 1.5 1994/11/13 21:05:28 phk Exp $
 
 .MAIN: all
 
@@ -53,7 +53,7 @@ depend: _SUBDIRUSE
 maninstall: _SUBDIRUSE
 .endif
 
-DISTRIBUTION?=	bindist
+DISTRIBUTION?=	bin
 .if !target(afterdistribute)
 afterdistribute:
 .endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index c04895d5af03..afc27faa5339 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.kmod.mk,v 1.5 1994/12/28 03:50:46 ache Exp $
+#	$Id: bsd.kmod.mk,v 1.6 1995/01/01 21:11:55 bde Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -101,7 +101,7 @@ afterinstall: realinstall
 realinstall: beforeinstall
 .endif
 
-DISTRIBUTION?=	bindist
+DISTRIBUTION?=	bin
 .if !target(distribute)
 distribute:
 	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${RELEASEDIR}/${DISTRIBUTION} SHARED=copies