don't do a strlen() if length is provided

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

diff --git a/usr/src/include/Makefile b/usr/src/include/Makefile
index 483014f..94d9271 100644 (file)
--- a/usr/src/include/Makefile
+++ b/usr/src/include/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.51 (Berkeley) %G%
+#      @(#)Makefile    5.54 (Berkeley) %G%

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


@@ -10,11 +10,11 @@ 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 \
 # Missing: mp.h
 
 FILES= a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.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 ranlib.h \
-       regexp.h resolv.h setjmp.h sgtty.h signal.h stab.h stddef.h stdio.h \
-       stdlib.h string.h strings.h struct.h sysexits.h time.h ttyent.h \
-       tzfile.h unistd.h utime.h utmp.h vis.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 \
+       ranlib.h regex.h regexp.h resolv.h setjmp.h sgtty.h signal.h \
+       stab.h stddef.h stdio.h stdlib.h string.h strings.h struct.h \
+       sysexits.h time.h ttyent.h tzfile.h unistd.h utime.h utmp.h vis.h

 
 MFILES=        float.h frame.h stdarg.h varargs.h
 LFILES=        errno.h fcntl.h syslog.h termios.h
 
 MFILES=        float.h frame.h stdarg.h varargs.h
 LFILES=        errno.h fcntl.h syslog.h termios.h


@@ -33,7 +33,7 @@ SHARED=       symlinks
 install: ${SHARED}
        @echo installing ${FILES}
        @-for i in ${FILES}; do \
 install: ${SHARED}
        @echo installing ${FILES}
        @-for i in ${FILES}; do \

-               cmp -s $$i ${DESTDIR}/usr/include/$$i || \
+               cmp -s $$i ${DESTDIR}/usr/include/$$i > /dev/null 2>&1 || \

                    install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
                    ${DESTDIR}/usr/include/$$i; \
        done
                    install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
                    ${DESTDIR}/usr/include/$$i; \
        done


@@ -46,8 +46,9 @@ install: ${SHARED}
                chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/$$i; \
                chmod 755 ${DESTDIR}/usr/include/$$i; \
                (cd $$i; for j in *.[ih]; do \
                chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/$$i; \
                chmod 755 ${DESTDIR}/usr/include/$$i; \
                (cd $$i; for j in *.[ih]; do \

-                       cmp -s $$j ${DESTDIR}/usr/include/$$i/$$j || \
-                       install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
+                       cmp -s $$j ${DESTDIR}/usr/include/$$i/$$j > \
+                           /dev/null 2>&1 || \
+                           install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \

                            ${DESTDIR}/usr/include/$$i/$$j; \
                done); \
        done
                            ${DESTDIR}/usr/include/$$i/$$j; \
                done); \
        done


@@ -73,15 +74,20 @@ copies:
        done
        rm -f ${DESTDIR}/usr/include/machine
        mkdir ${DESTDIR}/usr/include/machine
        done
        rm -f ${DESTDIR}/usr/include/machine
        mkdir ${DESTDIR}/usr/include/machine

-       cd /sys/${MACHINE}/include; \
-       tar cf - *.h | (cd ${DESTDIR}/usr/include/machine; tar xpfB -); \
+       cd /sys/${MACHINE}/include && \
+           tar cf - *.h | (cd ${DESTDIR}/usr/include/machine; tar xpfB -);
+       rm -f ${DESTDIR}/usr/include/X11
+       mkdir ${DESTDIR}/usr/include/X11
+       cd /usr/X11R4/include/X11 && \
+           tar cf - *.h | (cd ${DESTDIR}/usr/include/X11; tar xpfB -);

 
                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
 
                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 /sys/${MACHINE}/include ${DESTDIR}/usr/include/machine
-       chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/machine
+       ln -s ${DESTDIR}/sys/${MACHINE}/include ${DESTDIR}/usr/include/machine
+       rm -f ${DESTDIR}/usr/include/X11
+       ln -s ${DESTDIR}/usr/X11R4/include/X11 ${DESTDIR}/usr/include/X11

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>