BSD 4_3_Reno release

[unix-history] / usr / src / sys / tahoestand / Makefile

diff --git a/usr/src/sys/tahoestand/Makefile b/usr/src/sys/tahoestand/Makefile
index de4783a..8e66e7f 100644 (file)
--- a/usr/src/sys/tahoestand/Makefile
+++ b/usr/src/sys/tahoestand/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    7.10 (Berkeley) 5/1/89
+#      @(#)Makefile    7.13 (Berkeley) 7/4/90

 #
 
 RELOC=         800
 #
 
 RELOC=         800


@@ -26,8 +26,8 @@ LDTOPT=               -T ${RELOC} -e _entry -x
 
 DESTDIR=
 VPATH= ../stand
 
 DESTDIR=
 VPATH= ../stand

-LIBS=  libsa.a ${DESTDIR}/lib/libc.a
-COPTS= -O -I. -I../stand -I../h
+LIBS=  libsa.a ${DESTDIR}/usr/lib/libc.a
+COPTS= -O -I. -I../stand -I..

 CFLAGS=        -DSTANDALONE -DCOMPAT_42 -DTAHOE -DRELOC=0x${RELOC} ${COPTS}
 SUBDIR=        vdformat
 ALL=   boot cat copy ls
 CFLAGS=        -DSTANDALONE -DCOMPAT_42 -DTAHOE -DRELOC=0x${RELOC} ${COPTS}
 SUBDIR=        vdformat
 ALL=   boot cat copy ls


@@ -107,15 +107,11 @@ depend: ${SRCS}
        for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} depend); done
 
 install:
        for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} depend); done
 
 install:

-       -mkdir ${DESTDIR}/stand
-       for i in ${ALL}; do \
-               install -o bin -g bin -m 644 $$i ${DESTDIR}/stand/$$i; \
+       install -o bin -g bin -m 644 cat copy ls ${DESTDIR}/stand
+       install -o bin -g bin -m 644 boot ${DESTDIR}/
+       for i in ${SUBDIR}; do \
+               (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install) \

        done
        done

-       rm -f ${DESTDIR}/boot;
-       cp ${DESTDIR}/stand/boot ${DESTDIR}/boot
-#      for i in ${SUBDIR}; do \
-#              (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install) \
-#      done

 
 tags: ${SRCS}
        ctags ${SRCS}
 
 tags: ${SRCS}
        ctags ${SRCS}