Split the bacula start/start script into four files:

[bacula/bacula] / bacula / autoconf / Make.common.in

diff --git a/bacula/autoconf/Make.common.in b/bacula/autoconf/Make.common.in
index 953e74db351465a1231f505ef71d1c9c7930a946..840eb5a17a134cf04b6113937e1c25ab27024eda 100644 (file)
--- a/bacula/autoconf/Make.common.in
+++ b/bacula/autoconf/Make.common.in
@@ -15,13 +15,6 @@ FTPSITEDIR=#
 
 SHELL = /bin/sh
 
-# This variable makes it possible to move the installation root to another
-# directory. This is useful when you're creating a binary distribution
-# If empty, normal root will be used.
-# You can run eg. 'make install DESTDIR=/packages/rxvt-xx' to accomplish
-# that.
-# DESTDIR = /usr/local/X11/$(VERNAME)
-
 # Installation target directories & other installation stuff
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -30,8 +23,8 @@ manprefix =
 sbindir = @sbindir@
 sysconfdir = @sysconfdir@
 scriptdir = @scriptdir@
-mandir = @mandir@/man1
-manext = 1
+mandir = @mandir@/man8
+manext = 8
 
 # Tools & program stuff
 CC = @CC@
@@ -50,9 +43,9 @@ AR = @AR@
 RANLIB = @RANLIB@
 INSTALL = @INSTALL@
 # add the -s to the following in PRODUCTION mode
-INSTALL_PROGRAM = @INSTALL@ -m 754
+INSTALL_PROGRAM = @INSTALL@ -m @SBINPERM@
 INSTALL_DATA = @INSTALL@ -m 644
-INSTALL_SCRIPT = @INSTALL@ -m 754
+INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@
 INSTALL_CONFIG = @INSTALL@ -m 640
 
 # Flags & libs
@@ -60,11 +53,14 @@ CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 TTOOL_LDFLAGS = @TTOOL_LDFLAGS@
-#DEFS = @DEFS@
+#DEFS = @DEFS@ @LOCAL_DEFS@
 LIBS = @LIBS@
+WRAPLIBS = @WRAPLIBS@
 DINCLUDE = @DINCLUDE@
 DLIB = @DLIB@
 DB_LIBS = @DB_LIBS@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_INC = @PYTHON_INCDIR@
 
 # Windows (cygwin) flags 
 WCFLAGS = @WCFLAGS@