[GRASS-SVN] r43854 - grass/branches/develbranch_6

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Oct 11 02:55:03 EDT 2010


Author: hamish
Date: 2010-10-10 23:55:03 -0700 (Sun, 10 Oct 2010)
New Revision: 43854

Modified:
   grass/branches/develbranch_6/Makefile
Log:
'sed -i' doesn't work with MSys's make (#1191)

Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile	2010-10-11 02:40:56 UTC (rev 43853)
+++ grass/branches/develbranch_6/Makefile	2010-10-11 06:55:03 UTC (rev 43854)
@@ -292,8 +292,8 @@
 	@ # default to be /usr/local
 	@##### -cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - include | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
-	-sed -i -e "s#^\(GRASS_HOME.[^=]*\).*#\1= ${INST_DIR}#" -e "s#^\(RUN_GISBASE.[^=]*\).*#\1= ${INST_DIR}#" ${INST_DIR}/include/Make/Platform.make
-	-sed -i -e 's#/tools/g.html2man/g.html2man#/tools/g.html2man#' ${INST_DIR}/include/Make/Man.make
+	-sed -e "s#^\(GRASS_HOME.[^=]*\).*#\1= ${INST_DIR}#" -e "s#^\(RUN_GISBASE.[^=]*\).*#\1= ${INST_DIR}#" ${GISBASE}/include/Make/Platform.make > ${INST_DIR}/include/Make/Platform.make
+	-sed -e 's#/tools/g.html2man/g.html2man#/tools/g.html2man#' ${GISBASE}/include/Make/Man.make > ${INST_DIR}/include/Make/Man.make
 	-cd ${GISBASE} ; tar cBf - lib | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/monitorcap > ${INST_DIR}/etc/monitorcap
 	-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap



More information about the grass-commit mailing list