From: Lorenz Schori Date: Tue, 8 Sep 2009 15:00:20 +0000 (+0200) Subject: Fix minor issues in the osx installer package builder. X-Git-Tag: Release-7.0.0~2633^2~22 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8d8978098904eb8b0ab93aa72716d46f74e77397;p=bacula%2Fbacula Fix minor issues in the osx installer package builder. --- diff --git a/bacula/platforms/osx/Makefile.in b/bacula/platforms/osx/Makefile.in index 8be1b78fb6..1ef938b20f 100644 --- 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 142da56e33..48402bfccf 100644 --- a/bacula/platforms/osx/files/Info.plist.in +++ b/bacula/platforms/osx/files/Info.plist.in @@ -5,7 +5,7 @@ CFBundleIdentifier org.bacula.bacula-fd CFBundleShortVersionString - @VERSION@ + @BACULA_VERSION@ IFPkgFlagAllowBackRev IFPkgFlagAuthorizationAction