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

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-11-07 23:21:38 -0800 (Mon, 07 Nov 2011)
New Revision: 49126

Modified:
   grass/branches/develbranch_6/Makefile
Log:
alter where Man.make looks for g.html2man at build-time not install-time, so it can still find it if grass is run from the build dir and MODULE_TOPDIR has been overridden (ie by g.extension)

Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile	2011-11-06 21:37:51 UTC (rev 49125)
+++ grass/branches/develbranch_6/Makefile	2011-11-08 07:21:38 UTC (rev 49126)
@@ -141,6 +141,8 @@
 	done
 	-cp -f $(FILES) ${ARCH_DISTDIR}/
 	-cp -fr --parents include ${ARCH_DISTDIR}/
+	-sed -e 's+(MODULE_TOPDIR)/tools/g.html2man/g.html2man+(GISBASE)/tools/g.html2man+' \
+		include/Make/Man.make > ${ARCH_DISTDIR}/include/Make/Man.make
 
 #we leave this target for a while so that people can easily upgrade (11/2004):
 mix:
@@ -292,7 +294,6 @@
 	-cd ${GISBASE} ; tar cBf - include | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	-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#^\(ARCH_DISTDIR.[^=]*\).*#\1= ${INST_DIR}#" -e "s#^\(ARCH_BINDIR.[^=]*\).*#\1= ${UNIX_BIN}#" ${GISBASE}/include/Make/Grass.make > ${INST_DIR}/include/Make/Grass.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