formatting

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

diff --git a/usr/src/bin/Makefile b/usr/src/bin/Makefile
index 41d9460..d5e4409 100644 (file)
--- a/usr/src/bin/Makefile
+++ b/usr/src/bin/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    4.5     (Berkeley)      %G%
+#      @(#)Makefile    4.10    (Berkeley)      %G%

 #
 DESTDIR=
 CFLAGS=        -O
 #
 DESTDIR=
 CFLAGS=        -O


@@ -15,30 +15,31 @@ SCRIPT=     false true
 # explicit make lines.
 #
 STD=   ar cat cc chgrp chmod cmp date dd df du echo ed expr \
 # explicit make lines.
 #
 STD=   ar cat cc chgrp chmod cmp date dd df du echo ed expr \

-       grep hostid hostname kill ld ln login ls mail mkdir mt mv nice \
+       grep hostid hostname kill ld ln login ls mail mkdir mt nice \

        nm od pagesize passwd pr pwd rm rmail rmdir size strip stty su sync \
        nm od pagesize passwd pr pwd rm rmail rmdir size strip stty su sync \

-       tee test wall who write
+       tar tee test wall who write

 
 # Programs that must run setuid to root
 #
 
 # Programs that must run setuid to root
 #

-SETUID=        chgrp df login mail mkdir mv passwd rmdir su
+SETUID=        chgrp df login mail passwd su

 
 # C programs that live in the current directory and need explicit make lines.
 #
 
 # C programs that live in the current directory and need explicit make lines.
 #

-NSTD=  ps tar time
+NSTD=  ps time

 
 all:   ${SUBDIR} ${STD} ${NSTD} cp
 
 ${SUBDIR}: /tmp
        cd $@; make ${MFLAGS}
 
 
 all:   ${SUBDIR} ${STD} ${NSTD} cp
 
 ${SUBDIR}: /tmp
        cd $@; make ${MFLAGS}
 

-${STD} cp:
-       cc ${CFLAGS} -o $@ $@.c
+${STD} cp mv:
+       ${CC} ${CFLAGS} -o $@ $@.c

 
 

-# take care with cp, install uses it
+# take care with cp and mv, install uses them

 install:
        install cp ${DESTDIR}/bin/newcp; \
                mv ${DESTDIR}/bin/newcp ${DESTDIR}/bin/cp
 install:
        install cp ${DESTDIR}/bin/newcp; \
                mv ${DESTDIR}/bin/newcp ${DESTDIR}/bin/cp

+       install -c mv ${DESTDIR}/bin/mv; rm -f mv

        for i in ${SUBDIR}; do \
                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
        for i in ${SCRIPT}; do (install -c $$i.sh ${DESTDIR}/bin/$$i); done
        for i in ${SUBDIR}; do \
                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
        for i in ${SCRIPT}; do (install -c $$i.sh ${DESTDIR}/bin/$$i); done


@@ -76,9 +77,6 @@ depend:
 ps:
        cc ${CFLAGS} -o ps ps.c -lm
 
 ps:
        cc ${CFLAGS} -o ps ps.c -lm
 

-tar:
-       cc ${CFLAGS} -o tar tar.c -ljobs
-

 time:
        cc ${CFLAGS} -o time time.c -ljobs
 
 time:
        cc ${CFLAGS} -o time time.c -ljobs