checkpoint for new format

SCCS-vsn: contrib/Makefile 4.26

diff --git a/usr/src/contrib/Makefile b/usr/src/contrib/Makefile
index e882307..e5021f0 100644 (file)
--- a/usr/src/contrib/Makefile
+++ b/usr/src/contrib/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    4.25    (Berkeley)      %G%
+#      @(#)Makefile    4.26    (Berkeley)      %G%

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


@@ -11,7 +11,8 @@ LIBC= /lib/libc.a
 
 # Programs that live in subdirectories, and have makefiles of their own.
 #
 
 # Programs that live in subdirectories, and have makefiles of their own.
 #

-SUBDIR=        ansi bib emacs jove kermit mh patch rcs X X/X.local
+# emacs doesn't work anymore
+SUBDIR=        ansi bib jove kermit mh patch rcs X X/X.local

 
 all: ${SUBDIR}
 
 
 all: ${SUBDIR}
 


@@ -19,15 +20,16 @@ ${SUBDIR}: FRC
        cd $@; make ${MFLAGS}
 
 install:
        cd $@; make ${MFLAGS}
 
 install:

-       -for i in ${SUBDIR}; do \
-               (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
+       @-for i in ${SUBDIR}; do \
+               (echo "==> $$i"; \
+                   cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done

        for file in `find /usr/new/man -type f -name '*.0' -print`; do \
                sed -n -f /usr/man/makewhatis.sed $$file; \
        done | sort -u > whatis.db
        install -o bin -g bin -m 444 whatis.db ${DESTDIR}/usr/new/man/whatis
 
        for file in `find /usr/new/man -type f -name '*.0' -print`; do \
                sed -n -f /usr/man/makewhatis.sed $$file; \
        done | sort -u > whatis.db
        install -o bin -g bin -m 444 whatis.db ${DESTDIR}/usr/new/man/whatis
 

-clean:
-       -for i in ${SUBDIR}; do (echo $$i; cd $$i; make ${MFLAGS} clean); done
+cleandir clean:
+       @-for i in ${SUBDIR}; do \
+               (echo "==> $$i"; cd $$i; make ${MFLAGS} clean); done

 
 

-depend:
-FRC:
+depend FRC: