From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 28 Jul 2009 16:13:24 +0000 (-0400)
Subject: install AFSCommander in prefpane dir
X-Git-Tag: openafs-devel-1_5_61~18
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6640b8b064b238333a46ef72aa09913b06271a91;p=packages%2Fo%2Fopenafs.git

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>
---

diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in
index 2424466a0..c0beebc85 100644
--- a/src/packaging/MacOS/buildpkg.sh.in
+++ b/src/packaging/MacOS/buildpkg.sh.in
@@ -103,8 +103,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 c42aa41d7..612ab1fa0 100644
--- a/src/platform/DARWIN/Makefile.in
+++ b/src/platform/DARWIN/Makefile.in
@@ -16,9 +16,12 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 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
@@ -32,7 +35,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} $? $@
@@ -48,6 +52,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