[SCM] grass branch, master, updated. upstream/6.4.1-26-g65e494a

[Hamish Bowman]

The following commit has been merged in the master branch:
commit 65e494a63db122ebb8edaf924afd6757424880a8
Author: Hamish Bowman <hamish_b at yahoo.com>
Date:   Tue Sep 13 02:10:17 2011 +1200

    g.html2man wasn't happy with ${INST_DIR} as grass-6.4.1/

diff --git a/debian/rules b/debian/rules
index 56fc61c..e548712 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,8 +171,8 @@ install: build
 		debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/include/Make/Module.make
 
 	# adjust from build-server build dir to end-user's install dir
-	sed -i -e 's+^\(GRASS_HOME[ ]*=\) .*+\1 $${INST_DIR}+' \
-		-e 's+^\(RUN_GISBASE[ ]*=\) .*+\1 $${INST_DIR}+' \
+	sed -i -e "s+^\(GRASS_HOME[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+" \
+		-e "s+^\(RUN_GISBASE[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+" \
 		debian/tmp/usr/lib/$(BASE_NAME)/include/Make/Platform.make
 
 	# install helper scripts for building addon man pages

-- 
Geographic Resources Analysis Support System