[GRASS-SVN] r29423 - grass/trunk/macosx

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2007-12-12 10:24:52 -0500 (Wed, 12 Dec 2007)
New Revision: 29423

Modified:
   grass/trunk/macosx/Makefile
Log:
Different location for packagemaker in Leopard

Modified: grass/trunk/macosx/Makefile
===================================================================
--- grass/trunk/macosx/Makefile	2007-12-12 14:24:12 UTC (rev 29422)
+++ grass/trunk/macosx/Makefile	2007-12-12 15:24:52 UTC (rev 29423)
@@ -13,6 +13,11 @@
 INSTALL_BIN = ${INSTALL} -m 755
 LN = /bin/ln -sf
 LN_DIR = /bin/ln -sfh
+ifeq ($(findstring darwin9,$(ARCH)),darwin9)
+PACKAGEMAKER = /Developer/usr/bin/packagemaker
+else
+PACKAGEMAKER = /Developer/Tools/packagemaker
+endif
 
 SUBDIRS = 
 ifeq ($(MACOSX_APP),1)
@@ -103,7 +108,7 @@
 	-${INSTALL_DATA} pkg/resources/ReadMe.rtf dist/resources
 	-cd ${GISBASE} ; tar cBf - modbuild | (cd ${GRASS_HOME}/macosx/dist/resources ; tar xBf - ) 2>/dev/null
 	@# build the package
-	/Developer/Tools/packagemaker -build -ds -p "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" -f dist/${MACOSX_APP_NAME} -r dist/resources -i dist/Info.plist -d dist/Description.plist
+	${PACKAGEMAKER} -build -ds -p "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" -f dist/${MACOSX_APP_NAME} -r dist/resources -i dist/Info.plist -d dist/Description.plist
 	@# remove intermediate files
 	@# -rm -rf dist 2>/dev/null