cleanup for aux/syslog changes

SCCS-vsn: usr.sbin/sendmail/Makefile 4.3

diff --git a/usr/src/usr.sbin/sendmail/Makefile b/usr/src/usr.sbin/sendmail/Makefile
index 8594568..52e5beb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/Makefile
+++ b/usr/src/usr.sbin/sendmail/Makefile
@@ -1,7 +1,7 @@
 #
 #      Makefile for sendmail base directory
 #
 #
 #      Makefile for sendmail base directory
 #

-#              @(#)Makefile    4.2             %G%
+#              @(#)Makefile    4.3             %G%

 #
 
 ALL=   src/sendmail aux/syslog
 #
 
 ALL=   src/sendmail aux/syslog


@@ -19,18 +19,11 @@ CP= cp
 all:
        cd lib; make ${MFLAGS}
        cd src; m4 Makefile.m4 > Makefile; make ${MFLAGS}
 all:
        cd lib; make ${MFLAGS}
        cd src; m4 Makefile.m4 > Makefile; make ${MFLAGS}

-       cd aux; m4 Makefile.m4 > Makefile; make ${MFLAGS}
+       -cd aux; m4 Makefile.m4 > Makefile; make ${MFLAGS}

        cd cf;  make ${MFLAGS}
 #      cd doc; make ${MFLAGS}
 
 install: $(ALL) $(DIRS)
        cd cf;  make ${MFLAGS}
 #      cd doc; make ${MFLAGS}
 
 install: $(ALL) $(DIRS)

-       install -o 1            aux/syslog      $(DESTDIR)/etc/syslog
-       install -c -o 1 -m 644  aux/syslog.conf $(DESTDIR)/etc/syslog.conf
-       install -c -o 1 -m 644  /dev/null       $(DESTDIR)/etc/syslog.pid
-       install -c -o 1 -m 644  /dev/null       $(DESTDIR)$(SYSLOG)
-       for i in 0 1 2 3 4 5 6 7; do install -c -o 1 -m 644 /dev/null $(DESTDIR)$(SYSLOG).$$i; done
-       install -c -o 1         lib/newsyslog.sh $(DESTDIR)/usr/adm/newsyslog
-#      echo    '5 4 * * * sh /usr/adm/newsyslog' >> $(DESTDIR)/usr/lib/crontab

        install -s -m 4755      src/sendmail    $(SENDMAIL)
        install -c -m 644       lib/sendmail.hf $(SENDMAIL).hf
        install -c -m 666       /dev/null       $(SENDMAIL).st
        install -s -m 4755      src/sendmail    $(SENDMAIL)
        install -c -m 644       lib/sendmail.hf $(SENDMAIL).hf
        install -c -m 666       /dev/null       $(SENDMAIL).st


@@ -40,23 +33,30 @@ install: $(ALL) $(DIRS)
        $(LN)                   $(SENDMAIL)     $(DESTDIR)/usr/ucb/newaliases
        rm -f                                   $(DESTDIR)/usr/ucb/mailq
        $(LN)                   $(SENDMAIL)     $(DESTDIR)/usr/ucb/mailq
        $(LN)                   $(SENDMAIL)     $(DESTDIR)/usr/ucb/newaliases
        rm -f                                   $(DESTDIR)/usr/ucb/mailq
        $(LN)                   $(SENDMAIL)     $(DESTDIR)/usr/ucb/mailq

+#      install -o 1            aux/syslog      $(DESTDIR)/etc/syslog
+#      install -c -o 1 -m 644  aux/syslog.conf $(DESTDIR)/etc/syslog.conf
+#      install -c -o 1 -m 644  /dev/null       $(DESTDIR)/etc/syslog.pid
+#      install -c -o 1 -m 644  /dev/null       $(DESTDIR)$(SYSLOG)
+#      for i in 0 1 2 3 4 5 6 7; do install -c -o 1 -m 644 /dev/null $(DESTDIR)$(SYSLOG).$$i; done
+#      install -c -o 1         lib/newsyslog.sh $(DESTDIR)/usr/adm/newsyslog
+#      echo    '5 4 * * * sh /usr/adm/newsyslog' >> $(DESTDIR)/usr/lib/crontab

 
 src/sendmail:
        cd src; make ${MFLAGS} sendmail
 
 aux/syslog:
 
 src/sendmail:
        cd src; make ${MFLAGS} sendmail
 
 aux/syslog:

-       cd aux; make ${MFLAGS} syslog
+       -cd aux; make ${MFLAGS} syslog

 
 $(DESTDIR)/usr/spool/mqueue:
        mkdir                   $(DESTDIR)/usr/spool/mqueue
        chmod   777             $(DESTDIR)/usr/spool/mqueue
 
 clean:
 
 $(DESTDIR)/usr/spool/mqueue:
        mkdir                   $(DESTDIR)/usr/spool/mqueue
        chmod   777             $(DESTDIR)/usr/spool/mqueue
 
 clean:

-       cd src; make ${MFLAGS} clean
-       cd cf;  make ${MFLAGS} clean
-       cd aux; make ${MFLAGS} clean
-       cd lib; make ${MFLAGS} clean
-       cd doc; make ${MFLAGS} clean
+       -cd src; make ${MFLAGS} clean
+       -cd cf;  make ${MFLAGS} clean
+       -cd aux; make ${MFLAGS} clean
+       -cd lib; make ${MFLAGS} clean
+       -cd doc; make ${MFLAGS} clean

 
 dirs:
        mkdir $(SRCROOT)
 
 dirs:
        mkdir $(SRCROOT)