[GRASS-SVN] r58714 - in grass/branches/develbranch_6/macosx: . app pkg/resources

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2014-01-13 17:33:31 -0800 (Mon, 13 Jan 2014)
New Revision: 58714

Modified:
   grass/branches/develbranch_6/macosx/Makefile
   grass/branches/develbranch_6/macosx/app/build_html_user_index.sh
   grass/branches/develbranch_6/macosx/pkg/resources/postflight.in
Log:
install all OS X help links at startup

Modified: grass/branches/develbranch_6/macosx/Makefile
===================================================================
--- grass/branches/develbranch_6/macosx/Makefile	2014-01-13 23:41:55 UTC (rev 58713)
+++ grass/branches/develbranch_6/macosx/Makefile	2014-01-14 01:33:31 UTC (rev 58714)
@@ -54,8 +54,6 @@
 real-install-macosx: PREFIX_TARGET = ${prefix}
 real-install-macosx: install-basic-macosx macosx-support-dir bundle-macosx
 	-cd ${GISBASE} ; tar cBf - modbuild | (cd ${MACOSX_SUPPDIR} ; tar xBf - ) 2>/dev/null
-	@# help file package
-	${LN_DIR} "${INST_DIR_TARGET}/docs/html" /Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
 
 # create a packagemaker installer package.
 # pretty much the same as install, but needs intermediate install location

Modified: grass/branches/develbranch_6/macosx/app/build_html_user_index.sh
===================================================================
--- grass/branches/develbranch_6/macosx/app/build_html_user_index.sh	2014-01-13 23:41:55 UTC (rev 58713)
+++ grass/branches/develbranch_6/macosx/app/build_html_user_index.sh	2014-01-14 01:33:31 UTC (rev 58714)
@@ -182,7 +182,8 @@
 </html>" > $i.html
 done
 
-# add Help Viewer link in user docs folder
+# add Help Viewer links in user docs folder
 
 mkdir -p $HOME/Library/Documentation/Help/
-ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER
+ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon
+ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER

Modified: grass/branches/develbranch_6/macosx/pkg/resources/postflight.in
===================================================================
--- grass/branches/develbranch_6/macosx/pkg/resources/postflight.in	2014-01-13 23:41:55 UTC (rev 58713)
+++ grass/branches/develbranch_6/macosx/pkg/resources/postflight.in	2014-01-14 01:33:31 UTC (rev 58714)
@@ -14,10 +14,6 @@
 mkdir -p "$MACOSX_SUPPDIR/Modules/etc"
 mkdir -p "$MACOSX_SUPPDIR/Modules/docs/html"
 
-# help
-
-/bin/ln -sfh "$INST_DIR/docs/html" "/Library/Documentation/Help/GRASS-$GRASS_VER"
-
 # modbuild
 
 cp -Rf "$PACKAGE_PATH/Contents/Resources/modbuild" "$MACOSX_SUPPDIR"