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

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2011-10-11 07:07:27 -0700 (Tue, 11 Oct 2011)
New Revision: 48734

Modified:
   grass/trunk/macosx/Makefile
   grass/trunk/macosx/app/grass.sh.in
Log:
revert r37436 because space-in-path issues still appear

Modified: grass/trunk/macosx/Makefile
===================================================================
--- grass/trunk/macosx/Makefile	2011-10-11 13:52:39 UTC (rev 48733)
+++ grass/trunk/macosx/Makefile	2011-10-11 14:07:27 UTC (rev 48734)
@@ -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/Application Support/GRASS/${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
+MACOSX_SUPPDIR = /Library/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"`

Modified: grass/trunk/macosx/app/grass.sh.in
===================================================================
--- grass/trunk/macosx/app/grass.sh.in	2011-10-11 13:52:39 UTC (rev 48733)
+++ grass/trunk/macosx/app/grass.sh.in	2011-10-11 14:07:27 UTC (rev 48734)
@@ -34,9 +34,9 @@
 #override config dir.
 GRASS_CONFIG_DIR="Library/Preferences/GRASS/$grass_Ver"
 
-GISBASE_USER="$HOME/Library/Application Support/GRASS/$grass_ver"
+GISBASE_USER="$HOME/Library/GRASS/$grass_ver"
 export GISBASE_USER
-GISBASE_SYSTEM="/Library/Application Support/GRASS/$grass_ver"
+GISBASE_SYSTEM="/Library/GRASS/$grass_ver"
 export GISBASE_SYSTEM
 
 # for extra utils