This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index a6f56da8767bdcf85846af17aac1d54fc9745c18..65b008f80c610d44caf9587d89658527b7ca0a67 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -43,7 +43,7 @@ all: Makefile
 
 depend:
        @for I in ${all_subdirs}; \
-         do (cd $$I; echo "==>Entering directory `pwd`"; $(MAKE) $@ || exit 1); done
+         do (cd $$I; echo "==>Entering directory `pwd`"; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
        
 bacula-fd: Makefile       
        @for I in ${fd_subdirs}; \
@@ -55,9 +55,10 @@ bacula-fd: Makefile
 #-------------------------------------------------------------------------
 configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autoconf/config.h.in
        cd $(srcdir);
-       autoconf --localdir=$(srcdir)/autoconf \
+       autoconf --prepend-include=$(srcdir)/autoconf \
        autoconf/configure.in > configure
        chmod 755 configure
+       @rm -f config.cache
 
 config.status:
        if test -x config.status; then config.status --recheck; \
@@ -65,13 +66,14 @@ config.status:
 
 autoconf/config.h.in: autoconf/configure.in autoconf/acconfig.h
        cd $(srcdir);
-       autoheader --localdir=$(srcdir)/autoconf \
+       autoheader --prepend-include=$(srcdir)/autoconf \
        autoconf/configure.in > autoconf/config.h.in
        chmod 644 autoconf/config.h.in
 
 installdirs:
        $(MKDIR) $(DESTDIR)$(sbindir)
        $(MKDIR) $(DESTDIR)$(sysconfdir)
+       $(MKDIR) $(DESTDIR)$(scriptdir)
        $(MKDIR) $(DESTDIR)$(working_dir)
 #      $(MKDIR) $(DESTDIR)$(mandir)
 
@@ -84,24 +86,24 @@ uninstall:
 install-autostart: install-autostart-dir install-autostart-fd install-autostart-sd
 
 install-autostart-dir:
-       (cd platforms; $(MAKE) $@ || exit 1) 
+       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-fd:
-       (cd platforms; $(MAKE) $@ || exit 1) 
+       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-sd:
-       (cd platforms; $(MAKE) $@ || exit 1) 
+       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 uninstall-autostart: uninstall-autostart-dir uninstall-autostart-fd uninstall-autrun-sd
 
 uninstall-autostart-dir:
-       (cd platforms; $(MAKE) $@ || exit 1)
+       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-fd:
-       (cd platforms; $(MAKE) $@ || exit 1)
+       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-sd:
-       (cd platforms; $(MAKE) $@ || exit 1)
+       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 Makefile: Makefile.in
        cd $(topdir) \
@@ -117,6 +119,7 @@ Makefiles:
        chmod 755 src/cats/make_bdb_tables src/cats/drop_bdb_tables
        chmod 755 src/cats/make_test_tables src/cats/drop_test_tables
        chmod 755 src/cats/create_mysql_database
+       chmod 755 src/cats/make_catalog_backup src/cats/delete_catalog_backup
        chmod 755 src/cats/alter_mysql_tables
        chmod 755 src/cats/create_sqlite_database
        chmod 755 src/cats/alter_sqlite_tables
@@ -128,6 +131,7 @@ clean:
          do (cd $$I; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1); done
        @(cd platforms; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1)
        @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
+       @$(RMF) examples/1 examples/2 examples/devices/1 examples/devices/2
 
 
 # clean for distribution
@@ -141,29 +145,25 @@ distclean:
        @$(RMF) console gconsole
        @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
        @$(RMF) working/*
-       @$(RMF) -r CVS testsuite/CVS testsuite/config/CVS testsuite/console.test/CVS
        @$(RMF) -r examples/devices/CVS autoconf/CVS autoconf/gnome-macros/CVS
        @$(RMF) -r doc/techlogs/2002/CVS doc/techlogs/2001/CVS doc/techlogs/1.27/CVS
        @$(RMF) -r examples/CVS intl/CVS scripts/CVS
        @$(RMF) -r po/CVS src/immortal/CVS rescue/freebsd/CVS rescue/solaris/CVS
+       @$(RMF) -r CVS src/gnome-console/CVS src/tconsole/CVS
 
 distdirs:
        mkdir ../$(VERNAME);
        mkdir ../$(VERNAME)/autoconf;
-       @for I in $(all_subdirs); do (cd $$I; $(MAKE) $@ || (echo "Failed to make distclean in $$I"; exit 0) ); done
+       @for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo "Failed to make distclean in $$I"; exit 0) ); done
 
 distcopy:
        $(CP) -p $(DIST) ../$(VERNAME);
        $(CP) -p $(DIST_CFG) ../$(VERNAME)/autoconf;
-       @for I in $(all_subdirs); do (cd $$I; $(MAKE) $@ || exit 1); done
+       @for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 distrib: configure autoconf/config.h.in distdirs distcopy
 
 test:
-       $(CP) ./autoconf/config.guess .
-       runtest
-       $(RMF) config.guess
-       cat console.sum
 
 
 tar.gz:  ../$(VERNAME).tar.gz