From 4b0ad4d7a6d109d81709f172ec420788ea5f0fac Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 28 Jul 2009 12:13:24 -0400 Subject: [PATCH] install AFSCommander in prefpane dir make the AFSCommander prefPane be installed, in /Library (as are growl, macfuse, etc) Reviewed-on: http://gerrit.openafs.org/243 Tested-by: Derrick Brashear Reviewed-by: Simon Wilkinson Reviewed-by: Derrick Brashear (cherry picked from commit 6640b8b064b238333a46ef72aa09913b06271a91) Change-Id: Ic9e46c62ee3587012bed33c737573cfc18b4672d Reviewed-on: http://gerrit.openafs.org/946 --- src/packaging/MacOS/buildpkg.sh.in | 4 +++- src/platform/DARWIN/Makefile.in | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in index 93396696b..279f384f9 100644 --- a/src/packaging/MacOS/buildpkg.sh.in +++ b/src/packaging/MacOS/buildpkg.sh.in @@ -106,8 +106,10 @@ if [ $firstpass = yes ]; then mkdir $PKGROOT mkdir -p $PKGROOT/Library + mkdir -p $PKGROOT/Library/PreferencePanes chown root${SEP}admin $PKGROOT - chmod 775 $PKGROOT $PKGROOT/Library + chmod 775 $PKGROOT $PKGROOT/Library $PKGROOT/Library/PreferencePanes + (cd $BINDEST/tools && pax -rw * $PKGROOT/Library/PreferencePanes) mkdir -p $PKGROOT/Library/OpenAFS/Tools (cd $BINDEST && pax -rw * $PKGROOT/Library/OpenAFS/Tools) cd $RESSRC diff --git a/src/platform/DARWIN/Makefile.in b/src/platform/DARWIN/Makefile.in index e48ca6d24..073e6ac45 100644 --- a/src/platform/DARWIN/Makefile.in +++ b/src/platform/DARWIN/Makefile.in @@ -13,9 +13,12 @@ include ../../config/Makefile.version all: OpenAFS.prefPane afssettings afscell +AFSPreference/build/Release/OpenAFS.prefPane: OpenAFS.prefPane +afscell/build/Release/afscell.bundle: afscell +afscell/InstallerSections.plist: afscell + OpenAFS.prefPane: xcodebuild -project AFSPreference/OpenAFS.xcodeproj - mv AFSPreference/build/Release/OpenAFS.prefPane OpenAFS.prefPane afscell: cd afscell && xcodebuild @@ -29,7 +32,8 @@ install: \ dest: \ ${DEST}/etc/afssettings \ ${DEST}/installer/afscell.bundle \ - ${DEST}/installer/InstallerSections.plist + ${DEST}/installer/InstallerSections.plist \ + ${DEST}/tools/OpenAFS.prefPane ${DESTDIR}${sbindir}/afssettings: afssettings ${INSTALL} $? $@ @@ -45,6 +49,11 @@ ${DEST}/installer/afscell.bundle: afscell/build/Release/afscell.bundle ${DEST}/installer/InstallerSections.plist: afscell/InstallerSections.plist ${INSTALL} $? $@ +${DEST}/tools/OpenAFS.prefPane: AFSPreference/build/Release/OpenAFS.prefPane + mkdir -p ${DEST}/tools + rm -rf ${DEST}/tools/OpenAFS.prefPane + cp -R $? $@ + clean: $(RM) -rf OpenAFS.prefPane $(RM) -rf AFSPreference/build -- 2.39.5