Update the Makefile to work correctly when copying and/or symlinking

/usr/include.

Make comment about mp.h missing and remove it from the list of files.
Fix installation of ufs include files as this is now a tree ufs/{ffs,lfs,
mfs,ufs}.

Make setting of SHARED optional by makeing it SHARED?=.

Comment out installation of X11 includes since it does not work
for XFree86 until we get XFree86 to install as /usr/X11.

Update _PATH_UNIX to be /kernel.  Remove /usr/{contrib,old}/bin from
_PATH_STDPATH.

2 files changed, 38 insertions, 27 deletions

diff --git a/include/Makefile b/include/Makefile
index 998d458..00683ae 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -7,9 +7,10 @@
 #
 all clean cleandir depend lint tags:
 
+#MISSING mp.h
 FILES=	a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.h \
 	err.h fnmatch.h fstab.h fts.h glob.h grp.h kvm.h limits.h locale.h \
-	math.h memory.h mp.h mpool.h ndbm.h netdb.h nlist.h paths.h pwd.h \
+	math.h memory.h mpool.h ndbm.h netdb.h nlist.h paths.h pwd.h \
 	ranlib.h regex.h regexp.h resolv.h rune.h runetype.h setjmp.h \
 	sgtty.h signal.h stab.h stddef.h stdio.h stdlib.h string.h strings.h \
 	struct.h sysexits.h tar.h time.h ttyent.h tzfile.h unistd.h utime.h \
@@ -18,8 +19,10 @@ FILES=	a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.h \
 MFILES=	float.h frame.h stdarg.h varargs.h
 LFILES=	errno.h fcntl.h syslog.h termios.h
 
-DIRS=arpa protocols
-LDIRS=	net netccitt netinet netiso netns nfs sys ufs vm
+DIRS=	arpa protocols
+LDIRS=	net netccitt netinet netiso netns nfs sys vm
+LUDIR=	ufs
+UDIRS=	ufs/ffs ufs/lfs ufs/mfs ufs/ufs
 
 NOOBJ=	noobj
 
@@ -27,7 +30,7 @@ NOOBJ=	noobj
 # source (``symlinks''), or a separate copy (``copies''); (latter useful
 # in environments where it's not possible to keep /sys publicly readable)
 # SHARED=	copies
-SHARED=	symlinks
+SHARED?=	symlinks
 
 install: ${SHARED}
 	@echo installing ${FILES}
@@ -65,31 +68,39 @@ install: ${SHARED}
 	done
 
 copies:
-	@echo copies: ${LDIRS}
-	@-for i in ${LDIRS}; do \
-		rm -rf ${DESTDIR}/usr/include/$$i; \
-		cd /sys; \
-		tar Hcf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
+	rm -rf ${DESTDIR}/usr/include/${LUDIR}
+	@-for i in ${LDIRS} ${UDIRS}; do				\
+		echo ${SHARED} $$i;					\
+		rm -rf ${DESTDIR}/usr/include/$$i;			\
+		cd ../sys;						\
+		tar cf - $$i/*.h |					\
+			(cd ${DESTDIR}/usr/include; tar xpfB -);	\
+		chown -R ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/$$i;\
+		chmod -R 444 ${DESTDIR}/usr/include/$$i;		\
+		chmod 755 ${DESTDIR}/usr/include/$$i;			\
 	done
-	rm -f ${DESTDIR}/usr/include/machine
+	rm -rf ${DESTDIR}/usr/include/machine
 	mkdir ${DESTDIR}/usr/include/machine
-	cd /sys/${MACHINE}/include && \
-	    tar Hcf - *.h | (cd ${DESTDIR}/usr/include/machine; tar xpfB -);
-	rm -f ${DESTDIR}/usr/include/X11
-	mkdir ${DESTDIR}/usr/include/X11
-	cd /usr/X11/include/X11 && \
-	    tar Hcf - *.h | (cd ${DESTDIR}/usr/include/X11; tar xpfB -);
+	cd ../sys/${MACHINE}/include && \
+	    tar cf - *.h | (cd ${DESTDIR}/usr/include/machine; tar xpfB -);
+	chown -R ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/machine;
+	chmod -R 444 ${DESTDIR}/usr/include/machine;
+	chmod 755 ${DESTDIR}/usr/include/machine;
+#	rm -rf ${DESTDIR}/usr/include/X11
+#	mkdir ${DESTDIR}/usr/include/X11
+#	cd /usr/X11/include/X11 && \
+#	    tar cf - *.h | (cd ${DESTDIR}/usr/include/X11; tar xpfB -);
 
 symlinks:
-	@echo symlinks: ${LDIRS}
-	@for i in ${LDIRS}; do \
-		rm -rf ${DESTDIR}/usr/include/$$i; \
-		ln -s /sys/$$i ${DESTDIR}/usr/include/$$i; \
-		chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/$$i; \
+	@for i in ${LDIRS} ${LUDIR}; do					\
+		echo ${SHARED} $$i;					\
+		rm -rf ${DESTDIR}/usr/include/$$i;			\
+		ln -s /sys/$$i ${DESTDIR}/usr/include/$$i;		\
+		chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/$$i;	\
 	done
-	rm -f ${DESTDIR}/usr/include/machine
-	ln -s ${DESTDIR}/sys/${MACHINE}/include ${DESTDIR}/usr/include/machine
-	rm -f ${DESTDIR}/usr/include/X11
-	ln -s ${DESTDIR}/usr/X11/include/X11 ${DESTDIR}/usr/include/X11
+	rm -rf ${DESTDIR}/usr/include/machine
+	ln -s /sys/${MACHINE}/include ${DESTDIR}/usr/include/machine
+#	rm -rf ${DESTDIR}/usr/include/X11
+#	ln -s /usr/X11/include/X11 ${DESTDIR}/usr/include/X11
 
 .include <bsd.prog.mk>
diff --git a/include/paths.h b/include/paths.h
index 5f7a6b4..ecba76c 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -40,7 +40,7 @@
 #define	_PATH_DEFPATH	"/usr/bin:/bin"
 /* All standard utilities path. */
 #define	_PATH_STDPATH \
-	"/usr/bin:/bin:/usr/sbin:/sbin:/usr/contrib/bin:/usr/old/bin"
+	"/usr/bin:/bin:/usr/sbin:/sbin:"
 
 #define	_PATH_BSHELL	"/bin/sh"
 #define	_PATH_CONSOLE	"/dev/console"
@@ -56,7 +56,7 @@
 #define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
 #define	_PATH_SHELLS	"/etc/shells"
 #define	_PATH_TTY	"/dev/tty"
-#define	_PATH_UNIX	"/vmunix"
+#define	_PATH_UNIX	"/kernel"
 #define	_PATH_VI	"/usr/bin/vi"
 
 /* Provide trailing slash, since mostly used for building pathnames. */