From 97bbd0ba97b0c84c9eda40563b0825f4826a0d09 Mon Sep 17 00:00:00 2001
From: gdr-ftp <gdr-ftp>
Date: Wed, 22 Apr 1998 05:07:20 +0000
Subject: [PATCH] binconst.mk, binrelease.mk: 	- generalized the release
 target so that it can also be used 	  for chapter 8 programs.  This is
 done by defining the CHAPTER 	  macro to be 8. 	- if HAS_MKLINK_DATA
 or HAS_MKSO_DATA macros are set, then the 	  appropriate data files are
 copied when the 'release' target 	  is made.

---
 binconst.mk   |  7 ++++++-
 binrelease.mk | 34 +++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/binconst.mk b/binconst.mk
index a7e968b..e162a0f 100644
--- a/binconst.mk
+++ b/binconst.mk
@@ -2,7 +2,7 @@
 # Compilation constants for utilities (directories ./bin, ./sbin,
 # ./usr.bin, ./usr.sbin).  These are not used when building the libraries.
 #
-# $Id: binconst.mk,v 1.8 1998/03/08 17:12:28 gdr-ftp Exp $
+# $Id: binconst.mk,v 1.9 1998/04/22 05:07:19 gdr-ftp Exp $
 #
 # Devin Reade, 1997.
 #
@@ -39,8 +39,10 @@ DESC	*= $(PROG).desc
 # it ends in ".1"
 .IF $(HAS_BSD_MANPAGE) == $(NULL)
 	MAN1SFX	= 1
+	MAN8SFX	= 8
 .ELSE
 	MAN1SFX	= 1G
+	MAN8SFX = 8G
 .END
 
 # Objects are source file names with [.c|.asm] changed to .o
@@ -51,3 +53,6 @@ DESC	*= $(PROG).desc
 .ELSE
 	OBJS	+= {$(SRCS:b)}.o
 .END
+
+# where do we put all the (renamed) mkso.data files?
+MKSO_DIR	= $(RELEASE_DIR)/install
diff --git a/binrelease.mk b/binrelease.mk
index ce3dc13..f071c61 100644
--- a/binrelease.mk
+++ b/binrelease.mk
@@ -3,20 +3,40 @@
 # typical user programs.  They are likely not suitable for system
 # daemons, etc.
 #
-# $Id: binrelease.mk,v 1.2 1998/02/15 19:43:58 gdr-ftp Exp $
+# $Id: binrelease.mk,v 1.3 1998/04/22 05:07:20 gdr-ftp Exp $
 #
 
+.IF $(CHAPTER) == $(NULL)
+OLDSFX	= $(MAN1SFX)
+NEWSFX	= 1
+.ELSE
+OLDSFX	= $(MAN8SFX)
+NEWSFX	= 8
+.END
+
 # Place files where they will subsequently be archived in a binary
 # distribution.
-release: $(OBJ_DIR)$(PROG) $(PROG).$(MAN1SFX) $(DESC)
-	$(INSTALL) -d $(RELBIN) $(RELMAN)/man1 $(DESC_DIR)
+release: $(OBJ_DIR)$(PROG) $(PROG).$(OLDSFX) $(DESC)
+	$(INSTALL) -d $(RELBIN) $(RELMAN)/man$(NEWSFX) $(DESC_DIR)
 	$(INSTALL) $(OBJ_DIR)$(PROG) $(RELBIN)
-	$(INSTALL) $(PROG).$(MAN1SFX) $(RELMAN)/man1/$(PROG).1
+	$(INSTALL) $(PROG).$(OLDSFX) $(RELMAN)/man$(NEWSFX)/$(PROG).$(NEWSFX)
 	$(DESCU) -o $(DESC_SRC) $(DESC_SRC) $(DESC)
 
 # Install files into a live system.  This doesn't update the describe
 # database.
-install: $(OBJ_DIR)$(PROG) $(PROG).$(MAN1SFX)
-	$(INSTALL) -d $(BINDIR) $(MANDIR)/man1
+install: $(OBJ_DIR)$(PROG) $(PROG).$(OLDSFX)
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man$(NEWSFX)
 	$(INSTALL) $(OBJ_DIR)$(PROG) $(BINDIR)
-	$(INSTALL) $(PROG).$(MAN1SFX) $(MANDIR)/man1/$(PROG).1
+	$(INSTALL) $(PROG).$(OLDSFX) $(MANDIR)/man$(NEWSFX)/$(PROG).$(NEWSFX)
+
+.IF $(HAS_MKLINK_DATA) != $(NULL)
+release::
+	$(INSTALL) -d $(MKSO_DIR)
+	$(INSTALL) mklink.data $(MKSO_DIR)/mklink.$(PROG)
+.END
+
+.IF $(HAS_MKSO_DATA) != $(NULL)
+release::
+	$(INSTALL) -d $(MKSO_DIR)
+	$(INSTALL) mkso.data $(MKSO_DIR)/mkso.$(PROG)
+.END