[GRASS-SVN] r54803 - grass/branches/releasebranch_6_4

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-01-28 01:38:29 -0800 (Mon, 28 Jan 2013)
New Revision: 54803

Modified:
   grass/branches/releasebranch_6_4/Makefile
Log:
backport g.html2man installation improvements from devr6. (r46357, r49126, r49160, r54802)


Modified: grass/branches/releasebranch_6_4/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/Makefile	2013-01-28 09:34:20 UTC (rev 54802)
+++ grass/branches/releasebranch_6_4/Makefile	2013-01-28 09:38:29 UTC (rev 54803)
@@ -98,8 +98,8 @@
 	-cp -f ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} ${ARCH_DISTDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp
 	@test -d ${ARCH_DISTDIR}/tools/ || mkdir -p ${ARCH_DISTDIR}/tools/
 	-${INSTALL} tools/mkhtml.sh ${ARCH_DISTDIR}/tools/ 2>/dev/null
-	@test -d ${ARCH_DISTDIR}/tools/g.html2man/ || mkdir -p ${ARCH_DISTDIR}/tools/g.html2man/
-	-${INSTALL} tools/g.html2man/g.html2man ${ARCH_DISTDIR}/tools/g.html2man/ 2>/dev/null
+	@test -d ${ARCH_DISTDIR}/tools/g.html2man/ && rm -rf ${ARCH_DISTDIR}/tools/g.html2man/
+	-${INSTALL} tools/g.html2man/g.html2man ${ARCH_DISTDIR}/tools/ 2>/dev/null
 	@(cd tools ; sh -c "./build_html_index.sh")
 	@if [ `cat "$(ERRORLOG)" | wc -l` -gt 5 ] ; then \
 		echo "--"     >> $(ERRORLOG) ; \
@@ -143,6 +143,8 @@
 	done
 	-cp -f $(FILES) ${ARCH_DISTDIR}/
 	-cp -fr --parents include ${ARCH_DISTDIR}/
+	-sed -e 's+tools/g.html2man/g.html2man+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:
@@ -294,7 +296,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