tahoe/vax fixes

SCCS-vsn: include/Makefile 5.18

diff --git a/usr/src/include/Makefile b/usr/src/include/Makefile
index bc20a4d..d84326b 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.19 (Berkeley) 87/05/30
+#      @(#)Makefile    5.18 (Berkeley) 87/06/03

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


@@ -24,14 +24,10 @@ STD=        a.out.h ar.h assert.h ctype.h curses.h ndbm.h disktab.h \
        sgtty.h stab.h stdio.h string.h strings.h struct.h syscall.h \
        sysexits.h time.h ttyent.h tzfile.h utmp.h varargs.h vfont.h
 LINKS= errno.h signal.h syslog.h
        sgtty.h stab.h stdio.h string.h strings.h struct.h syscall.h \
        sysexits.h time.h ttyent.h tzfile.h utmp.h varargs.h vfont.h
 LINKS= errno.h signal.h syslog.h

-#ifdef vax
-#MACHINE=vax
-#MACHDEP=${MACHINE} vaxif vaxmba vaxuba
-#endif
-MACHINE=tahoe
-MACHDEP=${MACHINE} tahoeif tahoevba tahoemath
-NETDIRS=net netimp netinet netns
-SYSDIRS=${NETDIRS} ${MACHDEP}
+
+NETDIRS=       net netimp netinet netns
+TAHOEDIRS=     tahoe tahoemath tahoevba tahoeif
+VAXDIRS=       vax vaxmba vaxuba vaxif

 SHARED=        symlinks
 TAGSFILE=tags
 
 SHARED=        symlinks
 TAGSFILE=tags
 


@@ -63,8 +59,17 @@ install: ${SHARED}
        rm -f ${DESTDIR}/usr/include/frame.h
        ln -s machine/frame.h ${DESTDIR}/usr/include/frame.h
 
        rm -f ${DESTDIR}/usr/include/frame.h
        ln -s machine/frame.h ${DESTDIR}/usr/include/frame.h
 

-symlinks:
-       -for i in ${SYSDIRS}; do \
+symlinks: ${MACHINE}.symlinks
+       rm -rf ${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
+
+tahoe.symlinks:
+       -for i in ${NETDIRS} ${TAHOEDIRS}; do \

                rm -rf ${DESTDIR}/usr/include/$$i; \
                if [ ! -s ${DESTDIR}/usr/include/$$i ]; \
                then \
                rm -rf ${DESTDIR}/usr/include/$$i; \
                if [ ! -s ${DESTDIR}/usr/include/$$i ]; \
                then \


@@ -73,25 +78,38 @@ symlinks:
                        echo ${DESTDIR}/usr/include/$$i not removed; \
                fi; \
        done
                        echo ${DESTDIR}/usr/include/$$i not removed; \
                fi; \
        done

-       rm -rf ${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 \
+vax.symlinks:
+       -for i in ${NETDIRS} ${VAXDIRS}; do \

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

-               cd /sys; \
-               tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
+               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
        done

+
+copies: ${MACHINE}.copies

        rm -rf ${DESTDIR}/usr/include/sys;
        mkdir ${DESTDIR}/usr/include/sys; 
        chmod 775 ${DESTDIR}/usr/include/sys;
        -(cd /sys/h; tar cf - *.h | (cd ${DESTDIR}/usr/include/sys; tar xpfB -))
 
        rm -rf ${DESTDIR}/usr/include/sys;
        mkdir ${DESTDIR}/usr/include/sys; 
        chmod 775 ${DESTDIR}/usr/include/sys;
        -(cd /sys/h; tar cf - *.h | (cd ${DESTDIR}/usr/include/sys; tar xpfB -))
 

+tahoe.copies:
+       -for i in ${NETDIRS} ${TAHOEDIRS}; do \
+               rm -rf ${DESTDIR}/usr/include/$$i; \
+               cd /sys; \
+               tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
+       done
+
+vax.copies:
+       -for i in ${NETDIRS} ${VAXDIRS}; do \
+               rm -rf ${DESTDIR}/usr/include/$$i; \
+               cd /sys; \
+               tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
+       done
+

 tags:
        cwd=/usr/include; \
        for i in ${STD} ${LINKS}; do \
 tags:
        cwd=/usr/include; \
        for i in ${STD} ${LINKS}; do \


@@ -100,3 +118,5 @@ tags:
 
 clean:
        rm -f tags
 
 clean:
        rm -f tags

+
+depend: