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

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-01-28 02:12:09 -0800 (Mon, 28 Jan 2013)
New Revision: 54805

Modified:
   grass/branches/releasebranch_6_4/Makefile
Log:
if && fails, the build fails too. replace with if;then;fi (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/Makefile	2013-01-28 10:10:43 UTC (rev 54804)
+++ grass/branches/releasebranch_6_4/Makefile	2013-01-28 10:12:09 UTC (rev 54805)
@@ -98,7 +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/
+	@if test -d ${ARCH_DISTDIR}/tools/g.html2man/; then rm -rf ${ARCH_DISTDIR}/tools/g.html2man/; fi
 	-${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 \