From 03cff8f7cce0486440b5bf7f96f08b2d75aa7bbe Mon Sep 17 00:00:00 2001
From: gdr-ftp <gdr-ftp>
Date: Sun, 8 Mar 1998 18:14:55 +0000
Subject: [PATCH] Makefile: 	- updated for use with the new *.mk files
 libtermcap.rez: 	- added build date termcap.h: 	- added cvs ident
 string back in

---
 lib/libtermcap/Makefile       | 61 ++++++++++++++++++++---------------
 lib/libtermcap/libtermcap.rez |  7 ++--
 lib/libtermcap/termcap.h      |  2 +-
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile
index d3d0311..59122ba 100644
--- a/lib/libtermcap/Makefile
+++ b/lib/libtermcap/Makefile
@@ -1,36 +1,45 @@
 #
-# This is the top-level makefile for libtermcap, GNO v2.0.6
+# This is the makefile for libtermcap, GNO v2.0.6
 #
-# $Id: Makefile,v 1.2 1997/10/03 04:52:59 gdr Exp $
+# $Id: Makefile,v 1.3 1998/03/08 18:14:53 gdr-ftp Exp $
 #
 
-.INCLUDE: ../../paths.mk
-.INCLUDE: ../const.mk                          
-
-LIB	= libtermcap
-OBJS	= termcap.o tgoto.o tputs.o tparm.o tospeed.o
-LIBDIR	= /usr/lib
-MANDIR	= /usr/man/man3
-
-CFLAGS	+= -O78 -Slibtermcap -G25 -v -w
+LIB	= termcap
+SRCS	= termcap.c tgoto.c tputs.c tparm.c tospeed.c
+OPTIMIZE= 78
+CFLAGS	+= -I. -Slibtermcap
 CFLAGS	+= -DCM_N -DCM_GT -DCM_B -DCM_D -I.
 
-build:	$(LIB)
+LOCAL_SETUP	= local_setup
+HDIR		= $(RELEASE_DIR)/usr/include
 
-$(LIB): $(OBJS) $(LIB).r
-	$(RM) -f $@
-	$(MAKELIB) $(MAKELIBFLAGS) -l $@ $(OBJS)
-	$(CATREZ) -d $@ $(LIB).r
+.INCLUDE: /src/gno/lib/lib.mk
 
-install: beforeinstall $(LIB)
-	$(INSTALL) -d $(LIBDIR) $(MANDIR)
-	$(INSTALL) $(LIB) $(LIBDIR)
-	$(INSTALL) termcap.3 $(MANDIR)
+# If this target fails, do a manual update.
+local_setup:
+	cmp /usr/include/termcap.h termcap.h
 
-release: beforeinstall $(LIB)
-	$(INSTALL) -d $(RELEASE_DIR)$(LIBDIR) $(RELEASE_DIR)$(MANDIR)
-	$(INSTALL) $(LIB) $(RELEASE_DIR)$(LIBDIR)
-	$(INSTALL) termcap.3 $(RELEASE_DIR)$(MANDIR)
+release::
+	$(INSTALL) -d $(HDIR)
+	$(INSTALL) termcap.h $(HDIR)
+
+# LIBDIR	= /usr/lib
+# MANDIR	= /usr/man/man3
+
+# build:	$(LIB)
+
+#$(LIB): $(OBJS) $(LIB).r
+#	$(RM) -f $@
+#	$(MAKELIB) $(MAKELIBFLAGS) -l $@ $(OBJS)
+#	$(CATREZ) -d $@ $(LIB).r
+
+#install: beforeinstall $(LIB)
+#	$(INSTALL) -d $(LIBDIR) $(MANDIR)
+#	$(INSTALL) $(LIB) $(LIBDIR)
+#	$(INSTALL) termcap.3 $(MANDIR)
+
+#release: beforeinstall $(LIB)
+#	$(INSTALL) -d $(RELEASE_DIR)$(LIBDIR) $(RELEASE_DIR)$(MANDIR)
+#	$(INSTALL) $(LIB) $(RELEASE_DIR)$(LIBDIR)
+#	$(INSTALL) termcap.3 $(RELEASE_DIR)$(MANDIR)
 
-beforeinstall:
-	cmp ../../include/termcap.h termcap.h
diff --git a/lib/libtermcap/libtermcap.rez b/lib/libtermcap/libtermcap.rez
index 76cba10..2406be6 100644
--- a/lib/libtermcap/libtermcap.rez
+++ b/lib/libtermcap/libtermcap.rez
@@ -1,13 +1,14 @@
 /*
  * Resources for version and comment
  * 
- * $Id: libtermcap.rez,v 1.1 1997/10/03 04:52:59 gdr Exp $
+ * $Id: libtermcap.rez,v 1.2 1998/03/08 18:14:54 gdr-ftp Exp $
  */
 
 #define LIB	"libtermcap for GNO"
-#define PORTED	"Ported from 4.4BSD by Devin Reade."
+#define PORTED	"Ported from 4.4BSD\n"
 
 #include "Types.rez"
+#include "/src/gno/build.tools/builddate.rez"
 
 /*
  * Version
@@ -19,6 +20,7 @@ resource rVersion (1, purgeable3) {
 	verUS,	/* Country */
 	LIB,
 	PORTED
+	BUILD_DATE
 };
 
 /*
@@ -27,4 +29,5 @@ resource rVersion (1, purgeable3) {
 resource rComment (1, purgeable3) {
 	LIB "\n"
         PORTED
+        BUILD_DATE
 };
diff --git a/lib/libtermcap/termcap.h b/lib/libtermcap/termcap.h
index 5cb1a3a..97fd160 100644
--- a/lib/libtermcap/termcap.h
+++ b/lib/libtermcap/termcap.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* Don't include a cvs ident string; it interferes with the builds */
+/* $Id: termcap.h,v 1.3 1998/03/08 18:14:55 gdr-ftp Exp $ */
 
 #ifndef _TERMCAP_H_
 #define _TERMCAP_H_