This commit was manufactured by cvs2svn to create tag

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

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index b49b953a02daf66bd1942672f75e3f64b4bdd482..e3b44e6f3c7dc22f6624d7fc36efb87d6019ad0c 100644 (file)
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -43,13 +43,13 @@ all: Makefile bconsole @STATIC_CONS@
        @echo " "
 
 
-bconsole: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a
+bconsole: $(CONSOBJS) ../lib/libbac.a
        $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-             $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+             $(DLIB) $(CONS_LIBS) -lbac -lm $(LIBS) 
 
-static-bconsole: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a
+static-bconsole: $(CONSOBJS) ../lib/libbac.a
        $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-             $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+             $(DLIB) $(CONS_LIBS) -lbac -lm $(LIBS) 
        strip $@
 
 
@@ -68,24 +68,40 @@ 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
-       $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(sbindir)/bconsole
+       @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 \
           destconf=$$srcconf.new; \
           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
        if test -f static-bconsole; then \
-          $(INSTALL_SCRIPT) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
+          $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
        fi
 
 uninstall:
-       (cd $(DESTDIR)$(sbindir); $(RMF) bconsole)
-       (cd $(DESTDIR)$(sysconfdir); $(RMF) bconsole.conf bconsole.conf.new)
+       (cd $(DESTDIR)$(sbindir); $(RMF) bconsole static-bconsole)
+       (cd $(DESTDIR)$(sysconfdir); $(RMF) console.conf bconsole.conf bconsole.conf.new)
 
 
 
@@ -98,7 +114,7 @@ depend:
        @$(MV) Makefile Makefile.bak
        @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
        @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-       @$(CC) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @$(CC) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \