From: deraadt <deraadt@openbsd.org>
Date: Mon, 6 May 1996 21:44:03 +0000 (+0000)
Subject: hard-code the include installation path (mostly for speed)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dd9d2c6e2ebe541c429704ba947587ca13d635b3;p=openbsd

hard-code the include installation path (mostly for speed)
---

diff --git a/Makefile b/Makefile
index 7e0da9e474c..a8fcc474a90 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 1996/05/06 20:31:44 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 1996/05/06 21:44:03 deraadt Exp $
 #	$NetBSD: Makefile,v 1.25 1995/10/09 02:11:28 thorpej Exp $
 
 .include <bsd.own.mk>	# for NOMAN, if it's there.
@@ -38,7 +38,7 @@ afterinstall:
 
 build:
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	${MAKE} includes
+	(cd ${.CURDIR}/include; ${MAKE} includes)
 .if defined(KERBEROS)
 	(cd ${.CURDIR}/kerberosIV/include && ${MAKE} install)
 .endif
diff --git a/include/Makefile b/include/Makefile
index 32d563757fc..548bbbff26f 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,3 +1,4 @@
+#	$OpenBSD: Makefile,v 1.7 1996/05/06 21:44:19 deraadt Exp $
 #	$NetBSD: Makefile,v 1.57 1996/04/25 00:55:44 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -20,11 +21,12 @@ FILES=	a.out.h ar.h assert.h bitstring.h bm.h cpio.h ctype.h db.h dirent.h \
 
 MFILES=	float.h frame.h stdarg.h varargs.h
 LFILES=	errno.h fcntl.h syslog.h termios.h
-CFILES=	curses.h
 
 DIRS=	arpa protocols rpc rpcsvc
 LDIRS=	dev net netinet netccitt netiso netns nfs sys ufs vm ddb
 
+RDIRS=	../lib/libcurses ../lib/librpcsvc ../lib/libpcap
+
 NOOBJ=	noobj
 
 # Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies
@@ -56,17 +58,15 @@ includes:
 		rm -f ${DESTDIR}/usr/include/$$i; \
 		ln -s machine/$$i ${DESTDIR}/usr/include/$$i; \
 	done
-	@echo installing ${CFILES}
-	@-for i in ${CFILES}; do \
-		cmp -s ../lib/libcurses/$$i ${DESTDIR}/usr/include/$$i || \
-		    install -c -m 444 ../lib/libcurses/$$i \
-			${DESTDIR}/usr/include/$$i; \
-	done
 	chown -R ${BINOWN}:${BINGRP} ${DESTDIR}/usr/include
 	find ${DESTDIR}/usr/include -type f | \
 		xargs chmod a=r
 	find ${DESTDIR}/usr/include -type d | \
 		xargs chmod u=rwx,go=rx
+	@-for i in ${RDIRS}; do \
+		echo installing in ${.CURDIR}/$$i; \
+		(cd ${.CURDIR}/$$i; ${MAKE} includes) \
+	done
 
 copies:
 	@echo copies: ${LDIRS}
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 8c68067d878..408903dbfba 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -11,12 +11,11 @@ SRCS=	addbytes.c addch.c addnstr.c box.c clear.c clrtobot.c clrtoeol.c \
 	standout.c toucholap.c touchwin.c tscroll.c tstp.c tty.c unctrl.c
 MAN=	curses.3
 
-# done by src/include/Makefile now
-#includes:
-#	-cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/curses.h > \
-#	    /dev/null 2>&1 || \
-#	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 curses.h \
-#	    ${DESTDIR}/usr/include
+includes:
+	-cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/curses.h > \
+	    /dev/null 2>&1 || \
+	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 curses.h \
+	    ${DESTDIR}/usr/include
 
 .if make(install)
 SUBDIR+= PSD.doc
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 9f6be6b5e14..62e46b92268 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile,v 1.2 1996/03/04 15:47:13 mickey Exp $
-#	$NetBSD: Makefile,v 1.1 1995/03/06 11:38:04 mycroft Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/05/06 21:44:25 deraadt Exp $
+#	$NetBSD: Makefile,v 1.2 1996/04/29 20:32:24 jtc Exp $
 
 LIB=	pcap
 MAN=	pcap.3
@@ -14,7 +14,7 @@ SRCS=	pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
 
 CLEANFILES+= grammar.c scanner.c y.tab.h
 
-beforeinstall:
+includes:
 	@cd ${.CURDIR}; for i in $(HDRS); do \
 	    cmp -s $$i ${DESTDIR}/usr/include/$$i || \
 		{ j="install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index d8ffea56cca..6111df28faf 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1996/05/04 09:16:14 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/05/06 21:44:28 deraadt Exp $
 
 
 RPCSRCS=	bootparam_prot.x klm_prot.x mount.x nfs_prot.x\
@@ -15,18 +15,21 @@ NOPIC=
 all:		${HDRS}
 beforedepend:	${HDRS}
 
-includes:
+includes:	${HDRS}
 	install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
 		${DESTDIR}/usr/include/rpcsvc
+	@echo installing rpc .h and .x files
 	@for i in $(HDRS); do \
 	    cmp -s $$i ${DESTDIR}/usr/include/rpcsvc/$$i || \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
-		${DESTDIR}/usr/include/rpcsvc; \
+		{ j="install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${DESTDIR}/usr/include/rpcsvc"; \
+		echo $$j; $$j; } \
 	done
-	@for i in $(RPCSRCS); do \
+	@cd ${.CURDIR}; for i in $(RPCSRCS); do \
 	    cmp -s $(.CURDIR)/$$i ${DESTDIR}/usr/include/rpcsvc/$$i || \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 444 $(.CURDIR)/$$i \
-		${DESTDIR}/usr/include/rpcsvc; \
+		{ j="install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${DESTDIR}/usr/include/rpcsvc"; \
+		echo $$j; $$j; } \
 	done
 
 # new suffixes have to go afterwards, because bsd.lib.mk clears them
@@ -34,9 +37,7 @@ includes:
 .SUFFIXES: .x .c .h
 
 .x.c:
-	@echo generating $@...
-	@rpcgen -c ${.IMPSRC} -o ${.TARGET}
+	rpcgen -c ${.IMPSRC} -o ${.TARGET}
 
 .x.h:
-	@echo generating $@...
-	@rpcgen -h ${.IMPSRC} -o ${.TARGET}
+	rpcgen -h ${.IMPSRC} -o ${.TARGET}