upstream/1.1.5.1_cvsrelease/1.1.5.1_cvsreleng/1

7 files changed, 122 insertions, 26 deletions

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 3663abd22361..b75b9466cabd 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.dep.mk,v 1.3.2.1 1994/03/07 01:53:47 rgrimes Exp $
+#	$Id: bsd.dep.mk,v 1.4 1994/02/27 19:28:44 nate Exp $
 
 # some of the rules involve .h sources, so remove them from mkdep line
 .if !target(depend)
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 8d64918ddc74..7df1d71882ca 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.6 1994/02/03 19:58:23 jkh Exp $
+#	$Id: bsd.doc.mk,v 1.7 1994/04/19 17:15:55 jkh Exp $
 
 PRINTER?=	ps
 
@@ -8,6 +8,7 @@ EQN?=		eqn -T${PRINTER}
 GREMLIN?=	grn
 GRIND?=		vgrind -f
 INDXBIB?=	indxbib
+INSTALL?=	install
 PIC?=		pic
 REFER?=		refer
 ROFF?=		groff -T${PRINTER} ${MACROS} -o${PAGES}
@@ -72,7 +73,7 @@ install:
         else \
                 true ; \
         fi
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${DOC}.* \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${DOC}.* \
 	${DESTDIR}${BINDIR}/${VOLUME}
 
 spell: ${SRCS}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 313b52e72d9a..3667b73d0495 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.30 1994/02/09 16:23:21 ache Exp $
+#	$Id: bsd.lib.mk,v 1.39 1994/06/15 10:14:40 ache Exp $
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -11,7 +11,11 @@ SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
 SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
 .endif
 
-
+.if defined(DESTDIR)
+CFLAGS+= -I${DESTDIR}/usr/include
+CXXINCLUDES+= -I${DESTDIR}/usr/include/${CXX}
+.endif
+INSTALL?=	install
 LIBDIR?=	/usr/lib
 LINTLIBDIR?=	/usr/libdata/lint
 LIBGRP?=	bin
@@ -144,13 +148,21 @@ lib${LIB}_p.a:: ${POBJS}
 	@${AR} cTq lib${LIB}_p.a `lorder ${POBJS} | tsort` ${LDADD}
 	${RANLIB} lib${LIB}_p.a
 
+.if defined(DESTDIR)
+LDDESTDIR?=	-L${DESTDIR}/usr/lib
+.endif
+
+.if defined(CPLUSPLUSLIB) && !make(clean) && !make(cleandir)
+SOBJS+= ${DESTDIR}/usr/lib/c++rt0.o
+.endif
+
 SOBJS+= ${OBJS:.o=.so}
 lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${SOBJS}
 	@echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
 	@rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 	@$(LD) -Bshareable \
 	    -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-	    ${SOBJS} ${LDADD}
+	    ${SOBJS} ${LDDESTDIR} ${LDADD} ${SHARED_LDADD}
 
 lib${LIB}_pic.a:: ${SOBJS}
 	@echo building special pic ${LIB} library
@@ -194,21 +206,21 @@ beforeinstall:
 .endif
 
 realinstall: beforeinstall
-	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} lib${LIB}.a \
+	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} lib${LIB}.a \
 	    ${DESTDIR}${LIBDIR}
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .if !defined(NOPROFILE)
-	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    lib${LIB}_p.a ${DESTDIR}${LIBDIR}
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 .endif
 .if !defined(NOPIC)
 .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
-	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}
 .endif
 .if defined(INSTALL_PIC_ARCHIVE)
-	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .endif
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index dd5aee25e345..7836d0399948 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,19 +1,32 @@
 #	from: @(#)bsd.man.mk	5.2 (Berkeley) 5/11/90
-#	$Id: bsd.man.mk,v 1.4 1994/01/31 06:10:33 rgrimes Exp $
+#	$Id: bsd.man.mk,v 1.6 1994/06/05 20:42:39 csgr Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
+INSTALL?=	install
 MANGRP?=	bin
 MANOWN?=	bin
 MANMODE?=	444
 
 MANDIR?=	/usr/share/man/man
 MANSRC?=	${.CURDIR}
-MINSTALL=	install ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+MINSTALL=	${INSTALL}  ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 
-maninstall:
+MCOMPRESS=	gzip -f
+BASENAME=	basename
+ZEXTENSION=	.gz
+.if !defined(NOMANCOMPRESS)
+ZEXT=		${ZEXTENSION}
+.else
+ZEXT=
+.endif
+
+MANALL=		${MAN1} ${MAN2} ${MAN3} ${MAN3F} ${MAN4} ${MAN5}	\
+		${MAN6} ${MAN7} ${MAN8}
+
+maninstall: ${MANDEPEND}
 .if defined(MAN1) && !empty(MAN1)
 	(cd ${MANSRC}; ${MINSTALL} ${MAN1} ${DESTDIR}${MANDIR}1${MANSUBDIR})
 .endif
@@ -41,6 +54,33 @@ maninstall:
 .if defined(MAN8) && !empty(MAN8)
 	(cd ${MANSRC}; ${MINSTALL} ${MAN8} ${DESTDIR}${MANDIR}8${MANSUBDIR})
 .endif
+
+# by default all pages are compressed
+# we don't handle .so's yet
+.if !empty(MANALL:S/ //g)
+.if !defined(NOMANCOMPRESS) 
+	@set ${MANALL} ;						\
+	while test $$# -ge 1; do					\
+		name=`${BASENAME} $$1`;					\
+		sect=`expr $$name : '.*\.\([^.]*\)'`;			\
+		echo "compressing in"					\
+			"${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}:"	\
+			"$$name -> $${name}${ZEXT}";			\
+		${MCOMPRESS} ${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name ; \
+		shift ;							\
+	done ; true
+.else
+# we are installing uncompressed pages, so nuke any compressed pages
+	@set ${MANALL} ;						\
+	while test $$# -ge 1; do					\
+		name=`${BASENAME} $$1`;					\
+		sect=`expr $$name : '.*\.\([^.]*\)'`;			\
+		rm -f ${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name${ZEXTENSION};\
+		shift ;							\
+	done ; true
+.endif
+.endif
+
 .if defined(MLINKS) && !empty(MLINKS)
 	@set ${MLINKS}; \
 	while test $$# -ge 2; do \
@@ -54,8 +94,9 @@ maninstall:
 		sect=`expr $$name : '.*\.\([^.]*\)'`; \
 		dir=${DESTDIR}${MANDIR}$$sect; \
 		t=$${dir}${MANSUBDIR}/$$name; \
-		echo $$t -\> $$l; \
-		rm -f $$t; \
-		ln $$l $$t; \
+		echo $${t}${ZEXT} -\> $${l}${ZEXT}; \
+		rm -f $${t}${ZEXTENSION}; \
+		rm -f $${t}; \
+		ln $${l}${ZEXT} $${t}${ZEXT}; \
 	done; true
 .endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index fb7a348c4633..dc17f18f6785 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.own.mk,v 1.3 1994/01/31 06:10:35 rgrimes Exp $
+#	$Id: bsd.own.mk,v 1.5 1994/03/19 22:02:35 jkh Exp $
 
 BINGRP?=	bin
 BINOWN?=	bin
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 80ab11fcf589..8a24d4d52ec8 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.18 1994/01/31 06:10:37 rgrimes Exp $
+#	$Id: bsd.prog.mk,v 1.28 1994/06/15 10:14:41 ache Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -8,6 +8,10 @@
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
 
 CFLAGS+=${COPTS}
+.if defined(DESTDIR)
+CFLAGS+= -I${DESTDIR}/usr/include
+CXXINCLUDES+= -I${DESTDIR}/usr/include/${CXX}
+.endif
 
 STRIP?=	-s
 
@@ -15,6 +19,8 @@ BINGRP?=	bin
 BINOWN?=	bin
 BINMODE?=	555
 
+INSTALL?=	install
+.if !defined(DESTDIR)
 LIBCRT0?=	/usr/lib/crt0.o
 LIBC?=		/usr/lib/libc.a
 LIBCOMPAT?=	/usr/lib/libcompat.a
@@ -31,12 +37,38 @@ LIBM?=		/usr/lib/libm.a
 LIBMP?=		/usr/lib/libmp.a
 LIBPC?=		/usr/lib/libpc.a
 LIBPLOT?=	/usr/lib/libplot.a
+LIBREADLINE?=	/usr/lib/libreadline.a
 LIBRESOLV?=	/usr/lib/libresolv.a
 LIBRPCSVC?=	/usr/lib/librpcsvc.a
+LIBSKEY?=	/usr/lib/libskey.a
 LIBTELNET?=	/usr/lib/libtelnet.a
-LIBTERM?=	/usr/lib/libterm.a
+LIBTERM?=       /usr/lib/libtermcap.a
 LIBUTIL?=	/usr/lib/libutil.a
-
+.else
+LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
+LIBC?=		${DESTDIR}/usr/lib/libc.a
+LIBCOMPAT?=	${DESTDIR}/usr/lib/libcompat.a
+LIBCRYPT?=	${DESTDIR}/usr/lib/libcrypt.a
+LIBCURSES?=	${DESTDIR}/usr/lib/libcurses.a
+LIBDBM?=	${DESTDIR}/usr/lib/libdbm.a
+LIBDES?=	${DESTDIR}/usr/lib/libdes.a
+LIBGNUMALLOC?=	${DESTDIR}/usr/lib/libgnumalloc.a
+LIBGNUREGEX?=	${DESTDIR}/usr/lib/libgnuregex.a
+LIBL?=		${DESTDIR}/usr/lib/libl.a
+LIBKDB?=	${DESTDIR}/usr/lib/libkdb.a
+LIBKRB?=	${DESTDIR}/usr/lib/libkrb.a
+LIBM?=		${DESTDIR}/usr/lib/libm.a
+LIBMP?=		${DESTDIR}/usr/lib/libmp.a
+LIBPC?=		${DESTDIR}/usr/lib/libpc.a
+LIBPLOT?=	${DESTDIR}/usr/lib/libplot.a
+LIBREADLINE?=	${DESTDIR}/usr/lib/libreadline.a
+LIBRESOLV?=	${DESTDIR}/usr/lib/libresolv.a
+LIBRPCSVC?=	${DESTDIR}/usr/lib/librpcsvc.a
+LIBSKEY?=	${DESTDIR}/usr/lib/libskey.a
+LIBTELNET?=	${DESTDIR}/usr/lib/libtelnet.a
+LIBTERM?=       ${DESTDIR}/usr/lib/libtermcap.a
+LIBUTIL?=	${DESTDIR}/usr/lib/libutil.a
+.endif
 .if defined(NOSHARED)
 LDFLAGS+= -static
 .endif
@@ -55,6 +87,10 @@ CLEANFILES+=strings
 
 .endif
 
+.if defined(DESTDIR)
+LDDESTDIR?=	-L${DESTDIR}/usr/lib
+.endif
+
 .if defined(PROG)
 .if defined(SRCS)
 
@@ -64,12 +100,13 @@ OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 .if defined(LDONLY)
 
 ${PROG}: ${LIBCRT0} ${LIBC} ${DPSRCS} ${OBJS} ${DPADD} 
-	${LD} ${LDFLAGS} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDADD}
+	${LD} ${LDFLAGS} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDDESTDR} \
+		${LDADD}
 
 .else defined(LDONLY)
 
 ${PROG}: ${DPSRCS} ${OBJS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD}
 
 .endif
 
@@ -78,7 +115,8 @@ ${PROG}: ${DPSRCS} ${OBJS} ${LIBC} ${DPADD}
 SRCS= ${PROG}.c
 
 ${PROG}: ${DPSRCS} ${SRCS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD}
+	${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} \
+		${LDDESTDIR} ${LDADD}
 
 MKDEP=	-p
 
@@ -129,7 +167,7 @@ afterinstall:
 
 realinstall: _PROGSUBDIR
 .if defined(PROG)
-	install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${PROG} ${DESTDIR}${BINDIR}
 .endif
 .if defined(HIDEGAME)
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 71d12562ed44..154bd5183896 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	5.11 (Berkeley) 3/13/91
-#	$Id: sys.mk,v 1.5 1994/02/04 03:19:16 wollman Exp $
+#	$Id: sys.mk,v 1.7 1994/06/13 21:02:48 csgr Exp $
 
 unix=		We run FreeBSD, not UNIX.
 
@@ -18,7 +18,7 @@ CC=		cc
 CFLAGS=		-O
 
 CXX=		g++
-CXXFLAGS=	${CFLAGS}
+CXXFLAGS=	${CXXINCLUDES} ${CFLAGS}
 
 CPP=		cpp
 
@@ -100,3 +100,7 @@ YFLAGS=-d
 	rm -f lex.yy.c
 
 .include <bsd.own.mk>
+
+.if exists(/etc/make.conf)
+.include </etc/make.conf>
+.endif