[GRASS-SVN] r58948 - grass/branches/releasebranch_6_4/macosx

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2014-02-07 16:38:37 -0800 (Fri, 07 Feb 2014)
New Revision: 58948

Modified:
   grass/branches/releasebranch_6_4/macosx/Makefile
Log:
deleted too much in r58718; backport r57475

Modified: grass/branches/releasebranch_6_4/macosx/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/macosx/Makefile	2014-02-08 00:35:02 UTC (rev 58947)
+++ grass/branches/releasebranch_6_4/macosx/Makefile	2014-02-08 00:38:37 UTC (rev 58948)
@@ -26,6 +26,11 @@
 PKG_INST_DIR = ${prefix}
 endif
 
+SUBDIRS =
+ifeq ($(MACOSX_APP),1)
+SUBDIRS = app
+endif
+
 FILES = AUTHORS COPYING CHANGES REQUIREMENTS.html GPL.TXT
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
@@ -92,6 +97,7 @@
 	-cd ${GISBASE} ; tar cBf - include | (cd ${INST_DIR_TARGET} ; tar xBf - ) 2>/dev/null
 	-sed -e "s#^\(GRASS_HOME.[^=]*\).*#\1= ${INST_DIR}#" \
 		-e "s#^\(RUN_GISBASE.[^=]*\).*#\1= ${INST_DIR}#" \
+		-e "s#-isysroot /.*MacOSX.*\.sdk##g" \
 		${GISBASE}/include/Make/Platform.make > ${INST_DIR_TARGET}/include/Make/Platform.make
 	-sed -e "s#^\(ARCH_DISTDIR.[^=]*\).*#\1= ${INST_DIR}#" \
 		-e "s#^\(ARCH_BINDIR.[^=]*\).*#\1= ${UNIX_BIN}#" \