From 3488b209cc8c94bed542ca0b99b0ae4e76b77ffa Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 28 Dec 1996 17:42:48 +0000
Subject: [PATCH] Fix some more problems: - the .gz files are no longer used as
 intermediate files, it's in a pipe   now.  (gunzip normally deleted them
 anyway, but this should not hurt) - I accidently left a -p arg to install
 from testing.  Bruce says it should   be ${COPY} instead, but almost
 everything else in the tree uses plain -c   anyway. - Use "LINKS=" or two
 identical files are installed sepeately instead of   as links (doh!) - Use
 "LIB..." instead of "BIN..." for install permissions.  Note that we   still
 use bsd.prog.mk, not bsd.lib.mk because bsd.lib.mk has problems   (it can't
 install a library unless it compiles it). - Define LIBCOMPATDIR in
 Makefile.inc instead of using BINDIR.

Mostly submitted by: bde
---
 lib/compat/Makefile.inc      |  4 ++--
 lib/compat/compat1x/Makefile | 21 ++++++++++-----------
 lib/compat/compat20/Makefile | 12 ++++++------
 lib/compat/compat21/Makefile | 12 ++++++------
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/lib/compat/Makefile.inc b/lib/compat/Makefile.inc
index 3b0eaeed99cf..07eb565ddd59 100644
--- a/lib/compat/Makefile.inc
+++ b/lib/compat/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id$
+# $Id: Makefile.inc,v 1.1 1996/12/23 05:07:20 peter Exp $
 
-BINDIR?=	/usr/lib/compat
+LIBCOMPATDIR?=	${LIBDIR}/compat
diff --git a/lib/compat/compat1x/Makefile b/lib/compat/compat1x/Makefile
index ab2150e8686e..7b0e032ef261 100644
--- a/lib/compat/compat1x/Makefile
+++ b/lib/compat/compat1x/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1996/12/23 05:07:21 peter Exp $
+# $Id: Makefile,v 1.2 1996/12/23 21:47:26 jkh Exp $
 
 DISTRIBUTION=	compat1x
 
@@ -6,24 +6,23 @@ LIBS=	libc.so.1.1 libcurses.so.1.1 libf2c.so.1.1 libg++.so.1.1 \
 	libgcc.so.1.1 libgnumalloc.so.1.1 libgnuregex.so.1.1 libln.so.1.1 \
 	libm.so.1.1 libmalloc.so.1.1 libreadline.so.1.1 libresolv.so.1.1 \
 	librpcsvc.so.1.1 libskey.so.1.1 libtelnet.so.1.1 libtermcap.so.1.1 \
-	libtermlib.so.1.1 libutil.so.1.1 liby.so.1.1
+	libutil.so.1.1 liby.so.1.1
 
 CLEANFILES+=	${LIBS}
+LINKS=		${LIBCOMPATDIR}/libtermcap.so.1.1 \
+		${LIBCOMPATDIR}/libtermlib.so.1.1
 
 all:	${LIBS}
 
-.for lib in ${LIBS:S,libtermlib.so.1.1,,}
+.for lib in ${LIBS}
 ${lib}:	${lib}.gz.uu
-	uudecode ${.CURDIR}/${lib}.gz.uu
-	gunzip ${lib}.gz
+	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
-libtermlib.so.1.1: libtermcap.so.1.1
-	ln libtermcap.so.1.1 libtermlib.so.1.1
-
 install:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${LIBS} \
-		${DESTDIR}${BINDIR}
+	${INSTALL} ${COPY} -o ${LIBMODE} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
+		${DESTDIR}${LIBCOMPATDIR}
 
-# Get all the fruit, even though we don't set PROG
+# Get all the fruit, even though we don't set PROG.
+# XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>
diff --git a/lib/compat/compat20/Makefile b/lib/compat/compat20/Makefile
index 9f1e063a5312..06850838c0e4 100644
--- a/lib/compat/compat20/Makefile
+++ b/lib/compat/compat20/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1996/12/23 05:07:32 peter Exp $
+# $Id: Makefile,v 1.2 1996/12/23 21:47:27 jkh Exp $
 
 DISTRIBUTION=	compat20
 
@@ -11,13 +11,13 @@ all:	${LIBS}
 
 .for lib in ${LIBS}
 ${lib}:	${lib}.gz.uu
-	uudecode ${.CURDIR}/${lib}.gz.uu
-	gunzip ${lib}.gz
+	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 install:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${LIBS} \
-		${DESTDIR}${BINDIR}
+	${INSTALL} ${COPY} -o ${LIBMODE} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
+		${DESTDIR}${LIBCOMPATDIR}
 
-# Get all the fruit, even though we don't set PROG
+# Get all the fruit, even though we don't set PROG.
+# XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>
diff --git a/lib/compat/compat21/Makefile b/lib/compat/compat21/Makefile
index 8e141105be15..f7afc41dde1a 100644
--- a/lib/compat/compat21/Makefile
+++ b/lib/compat/compat21/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1996/12/23 05:07:37 peter Exp $
+# $Id: Makefile,v 1.2 1996/12/23 21:47:28 jkh Exp $
 
 DISTRIBUTION=	compat21
 
@@ -10,13 +10,13 @@ all:	${LIBS}
 
 .for lib in ${LIBS}
 ${lib}:	${lib}.gz.uu
-	uudecode ${.CURDIR}/${lib}.gz.uu
-	gunzip ${lib}.gz
+	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 install:
-	${INSTALL} -p -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${LIBS} \
-		${DESTDIR}${BINDIR}
+	${INSTALL} ${COPY} -o ${LIBMODE} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
+		${DESTDIR}${LIBCOMPATDIR}
 
-# Get all the fruit, even though we don't set PROG
+# Get all the fruit, even though we don't set PROG.
+# XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>