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

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Jan 28 01:34:21 PST 2013


Author: hamish
Date: 2013-01-28 01:34:20 -0800 (Mon, 28 Jan 2013)
New Revision: 54802

Modified:
   grass/branches/develbranch_6/Makefile
Log:
g.ext was having problems if a newer version of grass was installed over the top of an older one, and the Man.Make script was trying to execute a directory. hopefully this makes that problem go away.

Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile	2013-01-28 00:40:20 UTC (rev 54801)
+++ grass/branches/develbranch_6/Makefile	2013-01-28 09:34:20 UTC (rev 54802)
@@ -98,6 +98,7 @@
 	-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/ && 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 \



More information about the grass-commit mailing list