Fix minor issues in the osx installer package builder.

diff --git a/bacula/platforms/osx/Makefile.in b/bacula/platforms/osx/Makefile.in
index 8be1b78fb6ffc42af6eb38efcc7f631c12820fc0..1ef938b20f78bdb404dbc81135052f3242df4276 100644 (file)
--- a/bacula/platforms/osx/Makefile.in
+++ b/bacula/platforms/osx/Makefile.in
@@ -41,6 +41,7 @@ BACULA_SOURCE:=${WORKING_DIR}/bacula-${BACULA_VERSION}
 BACULA_DESTDIR:=${WORKING_DIR}/destdir
 BACULA_PREFIX:=/usr/local/bacula-${BACULA_VERSION}
 BACULA_FD_CONF:=/Library/Preferences/bacula/bacula-fd.conf
+BACULA_WORKING_DIR:=/private/var/bacula/working
 
 # Detect whether we sit inside the bacula source tree. In this case we won't
 # download the tar from sourceforge but instead work with what its there
@@ -69,7 +70,8 @@ CONFIGFLAGS:=--enable-client-only --prefix=${BACULA_PREFIX} \
     --with-dir-password=@DIR_PW@ --with-fd-password=@FD_PW@ \
     --with-sd-password=@SD_PW@ --with-mon-dir-password=@MON_DIR_PW@ \
     --with-mon-fd-password=@MON_FD_PW@ --with-mon-sd-password=@MON_SD_PW@ \
-    --with-basename=@BASENAME@ --with-hostname=@HOSTNAME@
+    --with-basename=@BASENAME@ --with-hostname=@HOSTNAME@ \
+    --with-working-dir=${BACULA_WORKING_DIR}
 CPPFLAGS:=-isysroot ${MACOSX_SDK_SYSROOT} ${MACOSX_VERSION_FLAGS}
 CFLAGS:=-O -g ${ARCHFLAGS}
 CXXFLAGS:=${CFLAGS}

diff --git a/bacula/platforms/osx/files/Info.plist.in b/bacula/platforms/osx/files/Info.plist.in
index 142da56e33940f72ed1573b2c909a0edbd58adf1..48402bfccf59157f4e851900bf0ab1fa8a06c2a1 100644 (file)
--- a/bacula/platforms/osx/files/Info.plist.in
+++ b/bacula/platforms/osx/files/Info.plist.in
@@ -5,7 +5,7 @@
        <key>CFBundleIdentifier</key>
        <string>org.bacula.bacula-fd</string>
        <key>CFBundleShortVersionString</key>
-       <string>@VERSION@</string>
+       <string>@BACULA_VERSION@</string>
        <key>IFPkgFlagAllowBackRev</key>
        <false/>
        <key>IFPkgFlagAuthorizationAction</key>