[GRASS-SVN] r54804 - grass/branches/develbranch_6
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jan 28 02:10:44 PST 2013
Author: hamish
Date: 2013-01-28 02:10:43 -0800 (Mon, 28 Jan 2013)
New Revision: 54804
Modified:
grass/branches/develbranch_6/Makefile
Log:
if && fails, the build fails too. replace with if;then;fi
Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile 2013-01-28 09:38:29 UTC (rev 54803)
+++ grass/branches/develbranch_6/Makefile 2013-01-28 10:10:43 UTC (rev 54804)
@@ -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 \
More information about the grass-commit
mailing list