[GRASS-SVN] r37436 - in grass/trunk/macosx: . app

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-05-24 13:55:29 -0400 (Sun, 24 May 2009)
New Revision: 37436

Modified:
   grass/trunk/macosx/Makefile
   grass/trunk/macosx/app/grass.sh.in
Log:
move support dir to more appropriate Application Support

Modified: grass/trunk/macosx/Makefile
===================================================================
--- grass/trunk/macosx/Makefile	2009-05-24 16:57:23 UTC (rev 37435)
+++ grass/trunk/macosx/Makefile	2009-05-24 17:55:29 UTC (rev 37436)
@@ -12,7 +12,7 @@
 MACOSX_APP_NAME = GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
 MACOSX_APPDIR = ${MACOSX_APP_NAME}/Contents/MacOS
 INST_DIR_MACOSX = ${prefix}/${MACOSX_APPDIR}
-MACOSX_SUPPDIR = /Library/GRASS/${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
+MACOSX_SUPPDIR = /Library/Application Support/GRASS/${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
 MACOSX_BUNDLE_PREFIX = ${GRASS_HOME}/macosx/dist/${MACOSX_APPDIR}
 VER_MINOR_REL = `printf "%d0%d" ${GRASS_VERSION_MINOR} ${GRASS_VERSION_RELEASE}`
 VER_DATE = `date +"%g%m%d"`
@@ -113,8 +113,8 @@
 	@# -rm -rf dist 2>/dev/null
 
 macosx-support-dir:
-	${MAKE_DIR_CMD} ${MACOSX_SUPPDIR}
-	${MAKE_DIR_CMD} ${MACOSX_SUPPDIR}/Modules/bin
-	${MAKE_DIR_CMD} ${MACOSX_SUPPDIR}/Modules/docs/html
-	${MAKE_DIR_CMD} ${MACOSX_SUPPDIR}/Modules/etc
-	${MAKE_DIR_CMD} ${MACOSX_SUPPDIR}/Modules/lib
+	${MAKE_DIR_CMD} "${MACOSX_SUPPDIR}"
+	${MAKE_DIR_CMD} "${MACOSX_SUPPDIR}/Modules/bin"
+	${MAKE_DIR_CMD} "${MACOSX_SUPPDIR}/Modules/docs/html"
+	${MAKE_DIR_CMD} "${MACOSX_SUPPDIR}/Modules/etc"
+	${MAKE_DIR_CMD} "${MACOSX_SUPPDIR}/Modules/lib"

Modified: grass/trunk/macosx/app/grass.sh.in
===================================================================
--- grass/trunk/macosx/app/grass.sh.in	2009-05-24 16:57:23 UTC (rev 37435)
+++ grass/trunk/macosx/app/grass.sh.in	2009-05-24 17:55:29 UTC (rev 37436)
@@ -28,8 +28,8 @@
 export GISBASE
 grass_ver=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
 
-GISBASE_USER="$HOME/Library/GRASS/$grass_ver"
-GISBASE_SYSTEM="/Library/GRASS/$grass_ver"
+GISBASE_USER="$HOME/Library/Application Support/GRASS/$grass_ver"
+GISBASE_SYSTEM="/Library/Application Support/GRASS/$grass_ver"
 
 # for extra utils
 # ideally user should have these in their PATH, but make sure here