From d00f2dadaa121157d610b6777f05f1946afd802e Mon Sep 17 00:00:00 2001
From: gdr-ftp <gdr-ftp>
Date: Sun, 8 Mar 1998 18:19:00 +0000
Subject: [PATCH] Makefile: 	- updated to use the new *.mk files inst.c: 
 - include <gno/contrib.h> vice "contrib.h" inst.rez: 	- added build date

---
 usr.bin/install/Makefile | 48 ++++++++++++++--------------------------
 usr.bin/install/inst.c   |  5 ++---
 usr.bin/install/inst.rez |  7 +++---
 3 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/usr.bin/install/Makefile b/usr.bin/install/Makefile
index 57f5c82..38a6f6e 100644
--- a/usr.bin/install/Makefile
+++ b/usr.bin/install/Makefile
@@ -1,46 +1,30 @@
 #
-# $Id: Makefile,v 1.1 1997/10/30 04:14:21 gdr Exp $
+# $Id: Makefile,v 1.2 1998/03/08 18:18:57 gdr-ftp Exp $
 #
 
 # Don't name this "install"; we change the name later.
 PROG		= inst
-
-.INCLUDE:	/src/gno/paths.mk
-.INCLUDE:	/src/gno/binconst.mk
-
 BINDIR		= /usr/bin
-MANDIR		= /usr/man
-OBJS		= $(SRCS:s/.c/.o/:f)
+CUSTOM_RELEASE	= true
+LDADD		= -lcontrib
 OPTIMIZE	= 78
 STACK		= 1024
 
-# Add -D__STACK_CHECK__ to DEFINES to show stack usage.
-DEFINES		+=
-CFLAGS		+= -I/src/gno/lib/libcontrib
-CFLAGS		+= -r -O$(OPTIMIZE) $(DEFINES) -s$(STACK)
-LDLIBS		+= -l/src/gno/lib/libcontrib/libcontrib
+.INCLUDE:	/src/gno/prog.mk
 
-RELBIN		= $(RELEASE_DIR)$(BINDIR)
-RELMAN		= $(RELEASE_DIR)$(MANDIR)
+INST		= $(OBJ_DIR)$(PROG)
 
-INST		= ./$(PROG)
+# This is and the next target are slightly different from the standard
+# 'release' and 'install' targets because the binary is renamed when
+# it is installed.
 
-.INCLUDE:	/src/gno/binrules.mk
-
-# Place files where they will subsequently be archived in a binary
-# distribution.
-#
-# This is slightly different from the standard 'release' target because
-# the binary is renamed when it is installed.
-#
-release: $(PROG) $(PROG).1 $(DESC)
+release: $(OBJ_DIR)$(PROG) $(PROG).$(MAN1SFX) $(DESC)
 	$(INST) -d $(RELBIN) $(RELMAN)/man1 $(DESC_DIR)
-	$(INST) $(PROG) $(RELBIN)/install
-	$(INST) $(PROG).1 $(RELMAN)/man1/install.1
-	$(DESCU) -o $(DESC_SRC) $(DESC_SRC) $(DESC)
-                          
-install: $(PROG) $(PROG).1 $(DESC)
-	$(INST) -d $(BINDIR) $(MANDIR)/man1 $(DESC_DIR)
-	$(INST) $(PROG) $(BINDIR)/install
-	$(INST) $(PROG).1 $(MANDIR)/man1/install.1
+	$(INST) $(OBJ_DIR)$(PROG) $(RELBIN)/install
+	$(INST) $(PROG).$(MAN1SFX) $(RELMAN)/man1/install.1
 	$(DESCU) -o $(DESC_SRC) $(DESC_SRC) $(DESC)
+
+install: $(OBJ_DIR)$(PROG) $(PROG).$(MAN1SFX)
+	$(INST) -d $(BINDIR) $(MANDIR)/man1
+	$(INST) $(OBJ_DIR)$(PROG) $(BINDIR)/install
+	$(INST) $(PROG).$(MAN1SFX) $(MANDIR)/man1/install.1
diff --git a/usr.bin/install/inst.c b/usr.bin/install/inst.c
index 4eca68a..a22e045 100644
--- a/usr.bin/install/inst.c
+++ b/usr.bin/install/inst.c
@@ -5,7 +5,7 @@
  * For copying and distribution information, see the file "COPYING"
  * accompanying this file.
  *
- * $Id: inst.c,v 1.3 1997/10/30 04:14:21 gdr Exp $
+ * $Id: inst.c,v 1.4 1998/03/08 18:18:58 gdr-ftp Exp $
  */
 
 #define	__USE_DYNAMIC_GSSTRING__
@@ -24,8 +24,7 @@
 #include <orca.h>
 #include <gsos.h>
 #include <err.h>
-
-#include "contrib.h"
+#include <gno/contrib.h>
 
 /* actions */
 #define ACTION_CHANGE_MODE	0x0001
diff --git a/usr.bin/install/inst.rez b/usr.bin/install/inst.rez
index 86e3f28..4ede365 100644
--- a/usr.bin/install/inst.rez
+++ b/usr.bin/install/inst.rez
@@ -5,10 +5,11 @@
  * For copying and distribution information, see the file "COPYING"
  * accompanying this file.
  *
- * $Id: inst.rez,v 1.2 1997/10/30 04:14:21 gdr Exp $
+ * $Id: inst.rez,v 1.3 1998/03/08 18:19:00 gdr-ftp Exp $
  */
 
 #include "Types.Rez"
+#include "/src/gno/build.tools/builddate.rez"
 
 resource rVersion (0x1, purgeable3, nocrossbank) {
 
@@ -20,6 +21,6 @@ resource rVersion (0x1, purgeable3, nocrossbank) {
         "install",
         "Unix-style install program --\n"
         "  copies files and creates directories\n"
-        "Devin Reade <gdr@eddore.myrias.com>\n"
-        "Canada"
+        "Devin Reade\n"
+        BUILD_DATE
 };