Просмотр исходного кода

revert https://trac.osgeo.org/grass/changeset/37436 because space-in-path issues still appear

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@48734 15284696-431f-4ddb-bdfa-cd5b030d7da7
William Kyngesburye 13 лет назад
Родитель
Сommit
a8c972dc49
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      macosx/Makefile
  2. 2 2
      macosx/app/grass.sh.in

+ 1 - 1
macosx/Makefile

@@ -12,7 +12,7 @@ include $(MODULE_TOPDIR)/include/Make/Dir.make
 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"`

+ 2 - 2
macosx/app/grass.sh.in

@@ -34,9 +34,9 @@ grass_ver=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
 #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