[GRASS-SVN] r49160 - in grass/branches/develbranch_6: . lib

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-11-09 12:39:22 -0800 (Wed, 09 Nov 2011)
New Revision: 49160

Modified:
   grass/branches/develbranch_6/Makefile
   grass/branches/develbranch_6/lib/Makefile
Log:
$(GISBASE) is volatile in the context of g.extension, so go back to a simpler solution.


Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile	2011-11-09 17:41:23 UTC (rev 49159)
+++ grass/branches/develbranch_6/Makefile	2011-11-09 20:39:22 UTC (rev 49160)
@@ -141,7 +141,7 @@
 	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+' \
+	-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):

Modified: grass/branches/develbranch_6/lib/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/Makefile	2011-11-09 17:41:23 UTC (rev 49159)
+++ grass/branches/develbranch_6/lib/Makefile	2011-11-09 20:39:22 UTC (rev 49160)
@@ -73,7 +73,7 @@
 	for file in ../include/vect/*.h ; do $(INSTALL_DATA) $$file $(GISBASE)/include/grass/vect/ ; done
 	for file in ../include/iostream/*.h ; do $(INSTALL_DATA) $$file $(GISBASE)/include/grass/iostream/ ; done
 	for file in ../include/Make/*.make ; do $(INSTALL_DATA) $$file $(GISBASE)/include/Make/ ; done
-	sed -e 's+(MODULE_TOPDIR)/tools/g.html2man/g.html2man+(GISBASE)/tools/g.html2man+' \
+	sed -e 's+tools/g.html2man/g.html2man+tools/g.html2man+' \
 		../include/Make/Man.make > $(GISBASE)/include/Make/Man.make
 
 clean: cleansubdirs