Add helper for ini files

[bacula/bacula] / bacula / platforms / osx / Makefile.in

diff --git a/bacula/platforms/osx/Makefile.in b/bacula/platforms/osx/Makefile.in
index 12cf18d4923c2d4f313a6f6d5ecc8a36078d48e9..b0de11f813b0ffeaa6261ca63b4d3bcf46fa7a35 100644 (file)
--- a/bacula/platforms/osx/Makefile.in
+++ b/bacula/platforms/osx/Makefile.in
@@ -50,6 +50,7 @@ ifneq ($(CURDIR),$(CURSUB))
 endif
 
 PACKAGE_TITLE:=Bacula File Daemon ${BACULA_VERSION}
+PACKAGE_ID:=org.bacula.bacula-fd.pkg
 PACKAGE_DIR:=${PRODUCTS_DIR}/${PACKAGE_TITLE}
 PACKAGE_BUNDLE:=${PACKAGE_DIR}/${PACKAGE_TITLE}.pkg
 PACKAGE_DMG:=${PRODUCTS_DIR}/${PACKAGE_TITLE}.dmg
@@ -66,14 +67,22 @@ CONFIGFLAGS:=--enable-client-only --prefix=${BACULA_PREFIX} \
 CPPFLAGS:=-isysroot ${MACOSX_SDK_SYSROOT} ${MACOSX_VERSION_FLAGS}
 CFLAGS:=-O -g ${ARCHFLAGS}
 CXXFLAGS:=${CFLAGS}
-LDFLAGS:=${MACOSX_VERSION_FLAGS} ${ARCHFLAGS}
+LDFLAGS:=-Wl,-syslibroot,${MACOSX_SDK_SYSROOT} ${MACOSX_VERSION_FLAGS} ${ARCHFLAGS}
+
+# required on snow leopard: compiling for 10.4 requires usage of gcc 4.0
+# system defaults to version 4.2
+CC:=gcc-4.0
+CPP:=cpp-4.0
+CXX:=g++-4.0
+CXXPP:=cpp-4.0
 
 # Placeholders for *.in files
 INFILE_SUBST=\
   -e "s,@PREFIX@,${BACULA_PREFIX},g" \
   -e "s,@BACULA_VERSION@,${BACULA_VERSION},g" \
   -e "s,@FD_CONF@,${BACULA_FD_CONF},g" \
-  -e "s,@BACULA_DESTDIR@,${BACULA_DESTDIR},g"
+  -e "s,@BACULA_DESTDIR@,${BACULA_DESTDIR},g" \
+  -e "s,@PACKAGE_ID@,${PACKAGE_ID},g"
 
 dmg: pkg
        hdiutil create -srcfolder "${PACKAGE_DIR}" "${PACKAGE_DMG}"
@@ -81,7 +90,7 @@ dmg: pkg
 pkg: ${BACULA_DESTDIR} ${BACULA_PMDOC} ${WORKING_DIR}/resources
        mkdir -p "${PACKAGE_DIR}"
 
-       ${PM} --doc "${BACULA_PMDOC}" --out "${PACKAGE_BUNDLE}"
+       ${PM} --doc "${BACULA_PMDOC}" --id "${PACKAGE_ID}" --no-recommend --out "${PACKAGE_BUNDLE}"
 
        cp ${WORKING_DIR}/resources/ReadMe.html "${PACKAGE_DIR}/ReadMe.html"
 
@@ -97,7 +106,7 @@ ${BACULA_PMDOC}: ${BACULA_DESTDIR} ${WORKING_DIR}/resources
                        files/installer.pmdoc.in/$$f > "${BACULA_PMDOC}/$$f"; \
        done
 
-       python installer-gencontents.py destdir > ${BACULA_PMDOC}/01destdir-contents.xml
+       python installer-gencontents.py ${BACULA_DESTDIR} > ${BACULA_PMDOC}/01destdir-contents.xml
 
 ${WORKING_DIR}/resources: ${BACULA_DESTDIR}
        mkdir -p "${WORKING_DIR}/resources"
@@ -114,8 +123,8 @@ ${WORKING_DIR}/resources: ${BACULA_DESTDIR}
        cp "${BACULA_SOURCE}/LICENSE" "${WORKING_DIR}/resources/License.txt"
 
 ${BACULA_DESTDIR}: ${BACULA_SOURCE}
-       (cd ${BACULA_SOURCE} && ./configure ${CONFIGFLAGS} CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}")
-       ${MAKE} -C ${BACULA_SOURCE} LDFLAGS="-Wl,-syslibroot,${MACOSX_SDK_SYSROOT} ${LDFLAGS}"
+       (cd ${BACULA_SOURCE} && ./configure ${CONFIGFLAGS} CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" CC="${CC}" CPP="${CPP}" CXX="${CXX}" CXXPP="${CXXPP}")
+       ${MAKE} -C ${BACULA_SOURCE}
        ${MAKE} -C ${BACULA_SOURCE} install DESTDIR="${CURDIR}/${BACULA_DESTDIR}"
 
        rm -rf "${BACULA_DESTDIR}/tmp"