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 <shadow@dementia.org>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 6640b8b064b238333a46ef72aa09913b06271a91)
Change-Id: Ic9e46c62ee3587012bed33c737573cfc18b4672d
Reviewed-on: http://gerrit.openafs.org/946

diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in
index 93396696bf189687de10969abebae97e49fff26a..279f384f9a4983d7d95f4194d09e9e5b911e847b 100644 (file)
--- 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 e48ca6d249c11dfa5aeae239c0b7bf220105069b..073e6ac45b0641de497680b9c32a8cdcbd72d781 100644 (file)
--- 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