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

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2008-03-31 22:26:49 -0400 (Mon, 31 Mar 2008)
New Revision: 30829

Modified:
   grass/trunk/macosx/Makefile
   grass/trunk/macosx/app/Makefile
Log:
remove unnecessary INSTALL_BIN

Modified: grass/trunk/macosx/Makefile
===================================================================
--- grass/trunk/macosx/Makefile	2008-03-31 14:22:33 UTC (rev 30828)
+++ grass/trunk/macosx/Makefile	2008-04-01 02:26:49 UTC (rev 30829)
@@ -10,7 +10,6 @@
 VER_MINOR_REL = `printf "%d0%d" ${GRASS_VERSION_MINOR} ${GRASS_VERSION_RELEASE}`
 VER_DATE = `date +"%g%m%d"`
 MAKE_DIR_CMD = mkdir -p -m 755
-INSTALL_BIN = ${INSTALL}
 LN = /bin/ln -sf
 LN_DIR = /bin/ln -sfh
 
@@ -65,7 +64,7 @@
 	-chmod -R a+rX ${prefix}/${MACOSX_APP_NAME} 2>/dev/null
 	-touch ${prefix}/${MACOSX_APP_NAME}
 	-cd ${GRASS_HOME} ; tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
-	-${INSTALL_BIN} ${GRASS_HOME}/gem/gem6 ${prefix}/${MACOSX_APP_NAME}/Contents/MacOS 2>/dev/null
+	-${INSTALL} ${GRASS_HOME}/gem/gem6 ${prefix}/${MACOSX_APP_NAME}/Contents/MacOS 2>/dev/null
 	-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}
@@ -93,7 +92,7 @@
 	-sed 's#'${GISBASE}'#'${INST_DIR_MACOSX}'#g' ${GISBASE}/etc/monitorcap > dist/${MACOSX_APPDIR}/etc/monitorcap
 	-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
+	-${INSTALL} ${GRASS_HOME}/gem/gem6 dist/${MACOSX_APP_NAME}/Contents/MacOS 2>/dev/null
 	@# extras to bundle
 	${MAKE} bundle-macosx
 	@# pkg resources

Modified: grass/trunk/macosx/app/Makefile
===================================================================
--- grass/trunk/macosx/app/Makefile	2008-03-31 14:22:33 UTC (rev 30828)
+++ grass/trunk/macosx/app/Makefile	2008-04-01 02:26:49 UTC (rev 30829)
@@ -16,7 +16,6 @@
 TCLTK_INTERNAL = \#
 endif
 MAKE_DIR_CMD = mkdir -p -m 755
-INSTALL_BIN = ${INSTALL}
 GRASS_VERSION_BUILD = `/bin/date "+%y%m%d"`
 
 OBJS = Info.plist GRASS.scpt grass.sh main.o
@@ -50,18 +49,18 @@
 	-tar cBf - English.lproj --exclude CVS | (cd ${APPDIR}/Resources ; tar xBf - ) 2>/dev/null
 	-${INSTALL_DATA} $(OBJDIR)/Info.plist ${APPDIR}
 	-${INSTALL_DATA} PkgInfo ${APPDIR}
-	-${INSTALL_BIN} $(OBJDIR)/grass.sh ${APPDIR}/MacOS
+	-${INSTALL} $(OBJDIR)/grass.sh ${APPDIR}/MacOS
 	-${INSTALL_DATA} $(OBJDIR)/GRASS.scpt ${APPDIR}/Resources/Scripts
-	-${INSTALL_BIN} build_html_user_index.sh ${APPDIR}/MacOS/etc
-	-${INSTALL_BIN} build_gui_user_menu.sh ${APPDIR}/MacOS/etc
+	-${INSTALL} build_html_user_index.sh ${APPDIR}/MacOS/etc
+	-${INSTALL} build_gui_user_menu.sh ${APPDIR}/MacOS/etc
 	@# TclTk embedding:
 ifdef OPENGL_X11
 	-${MAKE_DIR_CMD} ${APPDIR}/MacOS/bin
-	-${INSTALL_BIN} ${TCLTKPREFIX}/bin/tclsh${TCLTKVER} ${APPDIR}/MacOS/bin
-	-${INSTALL_BIN} ${TCLTKPREFIX}/bin/wish${TCLTKVER} ${APPDIR}/MacOS/bin
+	-${INSTALL} ${TCLTKPREFIX}/bin/tclsh${TCLTKVER} ${APPDIR}/MacOS/bin
+	-${INSTALL} ${TCLTKPREFIX}/bin/wish${TCLTKVER} ${APPDIR}/MacOS/bin
 	-${MAKE_DIR_CMD} ${APPDIR}/MacOS/lib
-	-${INSTALL_BIN} ${TCLTKPREFIX}/lib/libtcl${TCLTKVER}.dylib ${APPDIR}/MacOS/lib
-	-${INSTALL_BIN} ${TCLTKPREFIX}/lib/libtk${TCLTKVER}.dylib ${APPDIR}/MacOS/lib
+	-${INSTALL} ${TCLTKPREFIX}/lib/libtcl${TCLTKVER}.dylib ${APPDIR}/MacOS/lib
+	-${INSTALL} ${TCLTKPREFIX}/lib/libtk${TCLTKVER}.dylib ${APPDIR}/MacOS/lib
 	-cd ${TCLTKPREFIX}/lib ; tar cBf - tcl${TCLTKVER} | (cd ${APPDIR}/MacOS/lib ; tar xBf - ) 2>/dev/null
 	-cd ${TCLTKPREFIX}/lib ; tar cBf - tk${TCLTKVER} | (cd ${APPDIR}/MacOS/lib ; tar xBf - ) 2>/dev/null
 	-${MAKE_DIR_CMD} ${APPDIR}/MacOS/include