[GRASS-SVN] r30742 - grass/branches/releasebranch_6_3/macosx

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2008-03-26 10:12:29 -0400 (Wed, 26 Mar 2008)
New Revision: 30742

Modified:
   grass/branches/releasebranch_6_3/macosx/Makefile
Log:
merge from trunk r29552, r29843

Modified: grass/branches/releasebranch_6_3/macosx/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/macosx/Makefile	2008-03-26 14:02:09 UTC (rev 30741)
+++ grass/branches/releasebranch_6_3/macosx/Makefile	2008-03-26 14:12:29 UTC (rev 30742)
@@ -69,10 +69,6 @@
 	-cd ${GISBASE} ; tar cBf - modbuild | (cd ${MACOSX_SUPPDIR} ; tar xBf - ) 2>/dev/null
 	@# help file package - in the future files will go in /Library/Documentation/Help
 	${LN_DIR} "${INST_DIR}/docs/html" /Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
-	# TEMPORARY
-	-tar cBf - wx | (cd ${INST_DIR}/etc ; tar xBf - )
-	-mv -f ${INST_DIR}/etc/wx/wxgrass ${INST_DIR}/scripts/
-	-mv -f ${INST_DIR}/etc/wx/scripts/* ${INST_DIR}/scripts/
 
 # create a packagemaker installer package.
 # pretty much the same as install, but needs intermediate install location
@@ -98,10 +94,6 @@
 	-chmod -R a+rX dist/${MACOSX_APPDIR} 2>/dev/null
 	-cd ${GRASS_HOME} ; tar cBf - gem/skeleton | (cd ${MACOSX_BUNDLE_PREFIX}/etc ; tar xBf - ) 2>/dev/null
 	-${INSTALL_BIN} ${GRASS_HOME}/gem/gem6 dist/${MACOSX_APP_NAME}/Contents/MacOS 2>/dev/null
-	# TEMPORARY
-	-tar cBf - wx | (cd ${MACOSX_BUNDLE_PREFIX}/etc ; tar xBf - )
-	-mv -f ${MACOSX_BUNDLE_PREFIX}/etc/wx/wxgrass ${MACOSX_BUNDLE_PREFIX}/scripts/
-	-mv -f ${MACOSX_BUNDLE_PREFIX}/etc/wx/scripts/* ${MACOSX_BUNDLE_PREFIX}/scripts/
 	@# extras to bundle
 	${MAKE} bundle-macosx
 	@# pkg resources
@@ -116,6 +108,7 @@
 	@# build the package
 ifeq ($(XCODE_VER),xcode3)
 	${PACKAGEMAKER} --target 10.4 --root-volume-only --id org.osgeo.grass --root dist/${MACOSX_APP_NAME} --info dist/Info.plist --out "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" --resources dist/resources
+	rm -f "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg/Contents/Resources/TokenDefinitions.plist"
 else
 	${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
 endif