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

3 files changed, 20 insertions, 20 deletions

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}