Integrate Phil's Makefile patch

[bacula/bacula] / bacula / src / console / Makefile.in

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index d4695efda9e8c720f882c9b60534a0c8c8720ebe..2a5da51482b82c60569812b9f6781c3413f01a21 100644 (file)
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -68,7 +68,18 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+
 install: all
+       @if test -f ${DESTDIR}${sbindir}/console; then \
+          echo " "; \
+          echo "Warning!!!  ${DESTDIR}${sbindir}console found."; \
+          echo " console has been renamed bconsole, so console"; \
+          echo " is no longer used, and you might want to delete it."; \
+          echo " "; \
+       fi
        $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
        @srcconf=bconsole.conf; \
        if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
@@ -76,6 +87,11 @@ install: all
           echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
        else \
           destconf=$$srcconf; \
+          if  test -f ${DESTDIR}${sysconfdir}/console.conf; then \
+             echo "Existing console.conf moved to bconsole.conf"; \
+             @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \
+             destconf=$$srcconf.new; \
+          fi; \
        fi; \
        echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
        ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
@@ -85,7 +101,7 @@ install: all
 
 uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bconsole static-bconsole)
-       (cd $(DESTDIR)$(sysconfdir); $(RMF) bconsole.conf bconsole.conf.new)
+       (cd $(DESTDIR)$(sysconfdir); $(RMF) console.conf bconsole.conf bconsole.conf.new)