From 4c4cd9439f3f630c10772c65c69057fb5ff0f2cc Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 12 Mar 2009 18:05:33 +0000
Subject: [PATCH] Install bacula (start/stop script) in sbindir in addition to 
 scripts dir

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8522 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/configure                    | 2 +-
 bacula/scripts/Makefile.in          | 4 +++-
 bacula/src/version.h                | 4 ++--
 bacula/src/win32/libwin32/bacula.rc | 4 ++--
 bacula/technotes-2.5                | 2 ++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bacula/configure b/bacula/configure
index 2a3332813d..c67a1bce6c 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -2337,7 +2337,7 @@ post_host=
 if test "x$BACULA" != x; then
    post_host=`echo -${BACULA} | tr 'A-Z ' 'a-z-'`
 fi
-BACULA=${BACULA-Bacula}
+BACULA=${BACULA:-Bacula}
 VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 LSMDATE=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
diff --git a/bacula/scripts/Makefile.in b/bacula/scripts/Makefile.in
index d3a1629e20..01c436c35a 100755
--- a/bacula/scripts/Makefile.in
+++ b/bacula/scripts/Makefile.in
@@ -38,6 +38,7 @@ install: installdirs
 	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
 	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
 	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula
+	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(sbindir)/bacula
 	$(INSTALL_SCRIPT) bacula-ctl-dir $(DESTDIR)$(scriptdir)/bacula-ctl-dir
 	$(INSTALL_SCRIPT) bacula-ctl-fd $(DESTDIR)$(scriptdir)/bacula-ctl-fd
 	$(INSTALL_SCRIPT) bacula-ctl-sd $(DESTDIR)$(scriptdir)/bacula-ctl-sd
@@ -75,6 +76,7 @@ uninstall:
 	(cd $(DESTDIR)$(scriptdir); $(RMF) bconsole)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) gconsole)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) bacula)
+	(cd $(DESTDIR)$(sbindir);   $(RMF) bacula)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) bacula-ctl-dir)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) bacula-ctl-fd)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) bacula-ctl-sd)
@@ -84,7 +86,7 @@ uninstall:
 	(cd $(DESTDIR)$(scriptdir); $(RMF) dvd-handler)  
 	(cd $(DESTDIR)$(scriptdir); $(RMF) btraceback.gdb)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) btraceback.dbx)
-	(cd $(DESTDIR)$(sbindir); $(RMF) btraceback)
+	(cd $(DESTDIR)$(sbindir);   $(RMF) btraceback)
 
 Makefile: Makefile.in
 	cd $(topdir) \
diff --git a/bacula/src/version.h b/bacula/src/version.h
index eb5c4c2d2f..6b163e7b0d 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.5.41"
-#define BDATE   "07 March 2009"
-#define LSMDATE "07Mar09"
+#define BDATE   "12 March 2009"
+#define LSMDATE "12Mar09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
diff --git a/bacula/src/win32/libwin32/bacula.rc b/bacula/src/win32/libwin32/bacula.rc
index fca523cf05..af458961fe 100644
--- a/bacula/src/win32/libwin32/bacula.rc
+++ b/bacula/src/win32/libwin32/bacula.rc
@@ -67,7 +67,7 @@ BEGIN
             VALUE "FileDescription", "Bacula File daemon for Win32\0"
             VALUE "FileVersion", VERSION "\0"
             VALUE "InternalName", "Bacula\0"
-            VALUE "LegalCopyright", "Copyright Free Software Foundation Europe e.V., 1999-2008\0"
+            VALUE "LegalCopyright", "Copyright Free Software Foundation Europe e.V., 1999-2009\0"
             VALUE "LegalTrademarks", "Licensed under GNU GPL 2.0\0"
             VALUE "OriginalFilename", "bacula-fd.exe\0"
             VALUE "PrivateBuild", "\0"
@@ -118,7 +118,7 @@ BEGIN
     LTEXT           "      by Kern Sibbald",-1,134,38,78,10
     LTEXT           "For more information, see:",-1,115,60,100,10
     LTEXT           "         www.bacula.org",-1,115,70,100,10
-    LTEXT           "Copyright (C) 1999-2008, Free Software Foundation Europe e.V.",-1,7,120,175,10
+    LTEXT           "Copyright (C) 1999-2009, Free Software Foundation Europe e.V.",-1,7,120,175,10
     LTEXT           "Licensed under GNU GPL 2.0.",-1,7,130,175,10
     RTEXT           "Build Date:",-1,108,24,42,8
     RTEXT           "Bacula Version:",-1,100,9,50,8
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 56739fedc3..2a80e035a0 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -34,6 +34,8 @@ Code to be completed before 3.0.0 is released:
 
 General:
 12Mar09
+kes  Install bacula (start/stop script) in sbindir in addition to
+     scripts dir.
 ebl  Tweak configure to remove bash specific code
 ebl  Remove TCABD reference
 11Mar09
-- 
2.39.5