added Robert Elz's additions for new time package

[unix-history] / usr / src / include / Makefile

diff --git a/usr/src/include/Makefile b/usr/src/include/Makefile
index 4ac8242..3d03068 100644 (file)
--- a/usr/src/include/Makefile
+++ b/usr/src/include/Makefile
@@ -3,7 +3,7 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    5.11 (Berkeley) 86/03/26
+#      @(#)Makefile    5.16 (Berkeley) 87/03/04

 #
 # Doing a make install builds /usr/include
 #
 #
 # Doing a make install builds /usr/include
 #


@@ -20,12 +20,16 @@ DESTDIR=
 SUBDIRS=arpa pascal protocols
 STD=   a.out.h ar.h assert.h ctype.h curses.h ndbm.h disktab.h \
        fcntl.h fstab.h grp.h lastlog.h math.h memory.h mp.h mtab.h \
 SUBDIRS=arpa pascal protocols
 STD=   a.out.h ar.h assert.h ctype.h curses.h ndbm.h disktab.h \
        fcntl.h fstab.h grp.h lastlog.h math.h memory.h mp.h mtab.h \

-       netdb.h nlist.h pcc.h pwd.h ranlib.h setjmp.h \
+       netdb.h nlist.h pcc.h pwd.h ranlib.h resolv.h setjmp.h \

        sgtty.h stab.h stdio.h string.h strings.h struct.h syscall.h \
        sgtty.h stab.h stdio.h string.h strings.h struct.h syscall.h \

-       sysexits.h time.h ttyent.h utmp.h varargs.h vfont.h
+       sysexits.h time.h ttyent.h tzfile.h utmp.h varargs.h vfont.h

 LINKS= errno.h signal.h syslog.h
 LINKS= errno.h signal.h syslog.h

-MACHINE=vax
-MACHDEP=${MACHINE} vaxif vaxmba vaxuba
+#ifdef vax
+#MACHINE=vax
+#MACHDEP=${MACHINE} vaxif vaxmba vaxuba
+#endif
+MACHINE=tahoe
+MACHDEP=${MACHINE} tahoeif tahoevba tahoemath

 NETDIRS=net netimp netinet netns
 SYSDIRS=${NETDIRS} stand ${MACHDEP}
 SHARED=        symlinks
 NETDIRS=net netimp netinet netns
 SYSDIRS=${NETDIRS} stand ${MACHDEP}
 SHARED=        symlinks


@@ -48,6 +52,8 @@ install: ${SHARED}
                        install -c -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
                done); \
        done
                        install -c -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
                done); \
        done

+       -cmp -s Makefile.install ${DESTDIR}/usr/include/Makefile || \
+           install -c -m 444 Makefile.install ${DESTDIR}/usr/include/Makefile

        -for i in ${LINKS}; do \
                rm -f ${DESTDIR}/usr/include/$$i; \
                ln -s sys/$$i ${DESTDIR}/usr/include/$$i; \
        -for i in ${LINKS}; do \
                rm -f ${DESTDIR}/usr/include/$$i; \
                ln -s sys/$$i ${DESTDIR}/usr/include/$$i; \


@@ -58,12 +64,22 @@ install: ${SHARED}
        ln -s machine/frame.h ${DESTDIR}/usr/include/frame.h
 
 symlinks:
        ln -s machine/frame.h ${DESTDIR}/usr/include/frame.h
 
 symlinks:

-       for i in ${SYSDIRS}; do \
+       -for i in ${SYSDIRS}; do \

                rm -rf ${DESTDIR}/usr/include/$$i; \
                rm -rf ${DESTDIR}/usr/include/$$i; \

-               ln -s /sys/$$i ${DESTDIR}/usr/include/$$i; \
+               if [ ! -s ${DESTDIR}/usr/include/$$i ]; \
+               then \
+                       ln -s /sys/$$i ${DESTDIR}/usr/include/$$i; \
+               else \
+                       echo ${DESTDIR}/usr/include/$$i not removed; \
+               fi; \

        done
        rm -rf ${DESTDIR}/usr/include/sys
        done
        rm -rf ${DESTDIR}/usr/include/sys

-       ln -s /sys/h ${DESTDIR}/usr/include/sys
+       -if [ ! -s ${DESTDIR}/usr/include/sys ]; \
+       then \
+               ln -s /sys/h ${DESTDIR}/usr/include/sys; \
+       else \
+               echo ${DESTDIR}/usr/include/sys not removed; \
+       fi

 
 copies:
        -for i in ${SYSDIRS}; do \
 
 copies:
        -for i in ${SYSDIRS}; do \