From: Kern Sibbald Date: Thu, 8 May 2003 19:22:08 +0000 (+0000) Subject: Rework spec files, add DESTDIR, fix spelling of autochanger X-Git-Tag: Release-1.31~155 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c7266fb615b63c85e0292116b6f7b126c62ae52;p=bacula%2Fbacula Rework spec files, add DESTDIR, fix spelling of autochanger git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@501 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 309c1d823b..5df3c63c98 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1270,8 +1270,10 @@ redhat) platforms/redhat/bacula-fd \ platforms/redhat/bacula-sd \ platforms/redhat/bacula-dir \ - platforms/redhat/bacula.mysql.rh8.spec \ - platforms/redhat/bacula.sqlite.rh8.spec" + platforms/redhat/bacula.mysql.spec \ + platforms/redhat/bacula.sqlite.ul.spec \ + platforms/redhat/bacula.sqlite.spec \ + " hostname=`hostname -s` ;; gentoo) diff --git a/bacula/configure b/bacula/configure index f10f4067bb..470f9f1d08 100755 --- a/bacula/configure +++ b/bacula/configure @@ -9512,8 +9512,10 @@ redhat) platforms/redhat/bacula-fd \ platforms/redhat/bacula-sd \ platforms/redhat/bacula-dir \ - platforms/redhat/bacula.mysql.rh8.spec \ - platforms/redhat/bacula.sqlite.rh8.spec" + platforms/redhat/bacula.mysql.spec \ + platforms/redhat/bacula.sqlite.ul.spec \ + platforms/redhat/bacula.sqlite.spec \ + " hostname=`hostname -s` ;; gentoo) diff --git a/bacula/kernstodo b/bacula/kernstodo index 085bd20203..a17d628397 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -28,6 +28,7 @@ For 1.31 release: xeon-fd: Could not stat c:/Documents and Settings/All Users/Application Data/Humc:\Documents and Settings\All User98_AIX.kbf: ERR=No such file or directory +- Implement argv/argk in place of sscanf in the daemon protocol. - Examine Bare Metal restore problem. - Test multiple simultaneous Volumes - Document FInclude ... @@ -747,4 +748,3 @@ Done: (see kernsdone for more) stream. - Change M_INFO to M_RESTORED for all restored files. - Fix command prompt in gnome-console by checking on Ready. - diff --git a/bacula/platforms/Makefile.in b/bacula/platforms/Makefile.in index b8b8d8d549..9b0ba5e2a1 100644 --- a/bacula/platforms/Makefile.in +++ b/bacula/platforms/Makefile.in @@ -21,7 +21,7 @@ DISTVER=@DISTVER@ all: @for subdir in ${SUBDIRS}; do \ if [ -f $${subdir}/Makefile ]; then \ - (cd $${subdir}; make;) \ + (cd $${subdir}; $(MAKE) DESTDIR=$(DESTDIR);) \ fi; \ done @@ -31,19 +31,19 @@ install: install-autostart-dir install-autostart-fd install-autostart-sd install-autostart-dir: @if test x$(DISTNAME) != x ; then \ (cd $(DISTNAME); \ - $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ + $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ fi install-autostart-fd: @if test x$(DISTNAME) != x ; then \ (cd $(DISTNAME); \ - $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ + $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ fi install-autostart-sd: @if test x$(DISTNAME) != x ; then \ (cd $(DISTNAME); \ - $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ + $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ fi uninstall: uninstall-autostart-dir uninstall-autostart-fd uninstall-autrun-sd @@ -51,19 +51,19 @@ uninstall: uninstall-autostart-dir uninstall-autostart-fd uninstall-autrun-sd uninstall-autostart-dir: @if test x$(DISTNAME) != x ; then \ (cd $(DISTNAME); \ - $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ + $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ fi uninstall-autostart-fd: @if test x$(DISTNAME) != x ; then \ (cd $(DISTNAME); \ - $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ + $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ fi uninstall-autostart-sd: @if test x$(DISTNAME) != x ; then \ (cd $(DISTNAME); \ - $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ + $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \ fi depend: @@ -71,7 +71,7 @@ depend: clean: @for subdir in ${SUBDIRS}; do \ if [ -f $${subdir}/Makefile ]; then \ - (cd $${subdir}; make clean) \ + (cd $${subdir}; $(MAKE) clean) \ fi; \ done rm -f 1 2 3 @@ -81,7 +81,7 @@ distclean: @rm -rf CVS @for subdir in ${SUBDIRS}; do \ if [ -f $${subdir}/Makefile ]; then \ - (cd $${subdir}; make distclean) \ + (cd $${subdir}; $(MAKE) distclean) \ fi; \ (cd $${subdir}; rm -rf CVS) \ done diff --git a/bacula/platforms/redhat/.cvsignore b/bacula/platforms/redhat/.cvsignore index adc959fa0f..4223155683 100644 --- a/bacula/platforms/redhat/.cvsignore +++ b/bacula/platforms/redhat/.cvsignore @@ -2,12 +2,6 @@ Makefile bacula-dir bacula-fd bacula-sd -bacula.spec -bacula.sqlite.rh8.spec -bacula.client.rh8.spec -bacula.mysql.rh8.spec -bacula.sqlite.rh7.spec -bacula.client.rh7.spec -bacula.mysql.rh7.spec - - +bacula.mysql.spec +bacula.sqlite.spec +bacula.sqlite.ul.spec diff --git a/bacula/platforms/redhat/Makefile.in b/bacula/platforms/redhat/Makefile.in index 10f53782f5..9a0850fbd7 100644 --- a/bacula/platforms/redhat/Makefile.in +++ b/bacula/platforms/redhat/Makefile.in @@ -18,28 +18,28 @@ install-autostart: install-autostart-fd install-autostart-sd install-autostart-d install-autostart-fd: - @if test -f /etc/rc.d/init.d/bacula-fd; then \ + @if test -f $(DESTDIR)/etc/rc.d/init.d/bacula-fd; then \ /sbin/chkconfig --del bacula-fd; \ fi - @$(INSTALL_PROGRAM) -m 744 bacula-fd /etc/rc.d/init.d/bacula-fd + @$(INSTALL_PROGRAM) -m 744 bacula-fd $(DESTDIR)/etc/rc.d/init.d/bacula-fd # set symlinks for script at startup and shutdown @/sbin/chkconfig --add bacula-fd install-autostart-sd: - @if test -f /etc/rc.d/init.d/bacula-sd; then \ + @if test -f $(DESTDIR)/etc/rc.d/init.d/bacula-sd; then \ /sbin/chkconfig --del bacula-sd; \ fi - @$(INSTALL_PROGRAM) -m 744 bacula-sd /etc/rc.d/init.d/bacula-sd + @$(INSTALL_PROGRAM) -m 744 bacula-sd $(DESTDIR)/etc/rc.d/init.d/bacula-sd # set symlinks for script at startup and shutdown @/sbin/chkconfig --add bacula-sd install-autostart-dir: - @if test -f /etc/rc.d/init.d/bacula-dir; then \ + @if test -f $(DESTDIR)/etc/rc.d/init.d/bacula-dir; then \ /sbin/chkconfig --del bacula-dir; \ fi - @$(INSTALL_PROGRAM) -m 744 bacula-dir /etc/rc.d/init.d/bacula-dir + @$(INSTALL_PROGRAM) -m 744 bacula-dir $(DESTDIR)/etc/rc.d/init.d/bacula-dir # set symlinks for script at startup and shutdown @/sbin/chkconfig --add bacula-dir @@ -49,23 +49,23 @@ uninstall: uninstall-autostart uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir uninstall-autostart-fd: - @if test -f /etc/rc.d/init.d/bacula-fd; then \ + @if test -f $(DESTDIR)/etc/rc.d/init.d/bacula-fd; then \ /sbin/chkconfig --del bacula-fd; \ fi - @rm -f /etc/rc.d/init.d/bacula-fd + @rm -f $(DESTDIR)/etc/rc.d/init.d/bacula-fd uninstall-autostart-sd: - @if test -f /etc/rc.d/init.d/bacula-sd; then \ + @if test -f $(DESTDIR)/etc/rc.d/init.d/bacula-sd; then \ /sbin/chkconfig --del bacula-sd; \ fi - @rm -f /etc/rc.d/init.d/bacula-sd + @rm -f $(DESTDIR)/etc/rc.d/init.d/bacula-sd uninstall-autostart-dir: - @if test -f /etc/rc.d/init.d/bacula-dir; then \ + @if test -f $(DESTDIR)/etc/rc.d/init.d/bacula-dir; then \ /sbin/chkconfig --del bacula-dir; \ fi - @rm -f /etc/rc.d/init.d/bacula-dir + @rm -f $(DESTDIR)/etc/rc.d/init.d/bacula-dir clean: diff --git a/bacula/src/version.h b/bacula/src/version.h index caf7ec56fe..f40a9ce646 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -1,8 +1,8 @@ /* */ #define VERSION "1.31" #define VSTRING "1" -#define BDATE "07 May 2003" -#define LSMDATE "07May03" +#define BDATE "08 May 2003" +#define LSMDATE "08May03" /* Debug flags */ #define DEBUG 1