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

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2014-01-13 17:52:56 -0800 (Mon, 13 Jan 2014)
New Revision: 58717

Modified:
   grass/branches/develbranch_6/macosx/Makefile
   grass/branches/develbranch_6/macosx/pkg/resources/ReadMe.rtf
Log:
don't need modbuild now that g.extension works

Modified: grass/branches/develbranch_6/macosx/Makefile
===================================================================
--- grass/branches/develbranch_6/macosx/Makefile	2014-01-14 01:43:58 UTC (rev 58716)
+++ grass/branches/develbranch_6/macosx/Makefile	2014-01-14 01:52:56 UTC (rev 58717)
@@ -26,11 +26,6 @@
 PKG_INST_DIR = ${prefix}
 endif
 
-SUBDIRS = 
-ifeq ($(MACOSX_APP),1)
-SUBDIRS = app modbuild
-endif
-
 FILES = AUTHORS COPYING CHANGES REQUIREMENTS.html GPL.TXT
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
@@ -53,7 +48,7 @@
 real-install-macosx: INST_DIR_TARGET = ${INST_DIR}
 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
+	echo ${ARCH_DISTDIR}/${MACOSX_APP_NAME}
 
 # create a packagemaker installer package.
 # pretty much the same as install, but needs intermediate install location
@@ -70,7 +65,6 @@
 	-sed -e "s#@GRASS_VERSION_MAJOR@#${GRASS_VERSION_MAJOR}#g" -e "s#@GRASS_VERSION_MINOR@#${GRASS_VERSION_MINOR}#g" -e "s#@GRASS_VERSION_RELEASE@#${GRASS_VERSION_RELEASE}#g" -e "s#@VER_MINOR_REL@#${VER_MINOR_REL}#g" -e "s#@VER_DATE@#${VER_DATE}#g" -e "s#@PKG_INST_DIR@#${PKG_INST_DIR}#g" pkg/resources/Info.plist.in > dist/Info.plist
 	-${INSTALL_DATA} pkg/resources/License.rtf dist/resources
 	-${INSTALL_DATA} pkg/resources/ReadMe.rtf dist/resources
-	-cd ${GISBASE} ; tar cBf - modbuild | (cd ${GRASS_HOME}/macosx/dist/resources ; tar xBf - ) 2>/dev/null
 	@# build the package
 ifeq ($(XCODE_VER),xcode3)
 	${PACKAGEMAKER} --target 10.4 --root-volume-only --id org.osgeo.grass --root dist/${MACOSX_APP_NAME} --info dist/Info.plist --out "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" --resources dist/resources
@@ -119,4 +113,3 @@
 
 clean: cleansubdirs
 	-rm -rf ${ARCH_DISTDIR}/${MACOSX_APP_NAME}/ 2>/dev/null
-	-rm -rf ${ARCH_DISTDIR}/modbuild/ 2>/dev/null

Modified: grass/branches/develbranch_6/macosx/pkg/resources/ReadMe.rtf
===================================================================
(Binary files differ)