make it more robust

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

diff --git a/usr/src/contrib/Makefile b/usr/src/contrib/Makefile
index d5d396b..2e8664e 100644 (file)
--- a/usr/src/contrib/Makefile
+++ b/usr/src/contrib/Makefile
@@ -1,23 +1,41 @@
-#      Makefile        4.5     84/07/05
+#      Makefile        4.22    87/02/12

 #
 DESTDIR=
 CFLAGS=        -O
 
 # Programs that live in subdirectories, and have makefiles of their own.
 #
 #
 DESTDIR=
 CFLAGS=        -O
 
 # Programs that live in subdirectories, and have makefiles of their own.
 #

-SUBDIR=        apl bib courier cpm dsh icon hyper learn mh news notes rcs sccstorcs \
-       spms tools 
+SUBDIR=        ansi apl bib courier cpm dsh help hyper icon jove kermit mh \
+       mkmf np100 patch rcs sunrpc tac tools
+#
+# Default programs that are installed
+#
+STDINST=bib jove mh patch rcs
+#
+# Special purpose software that requires custom installation,
+# or may not be needed by all sites
+#
+OPTDIR=        B dipress emacs enet mmdf news nntp notes pathalias rn \
+       spms sumacc umodem xns X

 
 

-all:   ${SUBDIR}
+all:   ${STDINST}

 
 ${SUBDIR}: FRC
        cd $@; make ${MFLAGS}
 
 
 ${SUBDIR}: FRC
        cd $@; make ${MFLAGS}
 

+${OPTDIR}: FRC
+       cd $@; make ${MFLAGS} all
+

 install:
 install:

-       for i in ${SUBDIR}; do \
+       -for i in ${STDINST}; do \
+               (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
+
+installall:
+       -for i in ${SUBDIR}; do \

                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
 
 clean:
                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
 
 clean:

-       for i in ${SUBDIR}; do (echo $$i; cd $$i; make ${MFLAGS} clean); done
+       -for i in ${SUBDIR}; do (echo $$i; cd $$i; make ${MFLAGS} clean); done
+       -for i in ${OPTDIR}; do (echo $$i; cd $$i; make ${MFLAGS} clean); done

 
 FRC:
 
 FRC: