[SCM] grass branch, master, updated. upstream/6.4.1-29-gc3bb923

[Hamish Bowman]

The following commit has been merged in the master branch:
commit c3bb92368300c0d61dc5138771081a849ac387db
Author: Hamish Bowman <hamish_b at yahoo.com>
Date:   Mon Nov 21 00:23:19 2011 +1300

    reflect new upstream install location for helper script

diff --git a/debian/grass-dev.dirs b/debian/grass-dev.dirs
index 5640abe..f0e4f73 100644
--- a/debian/grass-dev.dirs
+++ b/debian/grass-dev.dirs
@@ -1,5 +1,4 @@
 usr/lib/grass64/include
 usr/lib/grass64/include/Make
 usr/lib/grass64/tools
-usr/lib/grass64/tools/g.html2man
 usr/share/pkgconfig
diff --git a/debian/grass-dev.dirs.in b/debian/grass-dev.dirs.in
index 14be6a7..39dc82c 100644
--- a/debian/grass-dev.dirs.in
+++ b/debian/grass-dev.dirs.in
@@ -1,5 +1,4 @@
 usr/lib/grass at VERSION@/include
 usr/lib/grass at VERSION@/include/Make
 usr/lib/grass at VERSION@/tools
-usr/lib/grass at VERSION@/tools/g.html2man
 usr/share/pkgconfig
diff --git a/debian/rules b/debian/rules
index 70b52d7..26567c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -179,7 +179,7 @@ install: build
 	install -m 755 tools/mkhtml.sh \
 		debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/mkhtml.sh
 	install -m 755 tools/g.html2man/g.html2man \
-		debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/g.html2man/g.html2man
+		debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/g.html2man
 
 	# install pkg-config file
 	install -m 644 grass.pc debian/$(PKG_NAME)-dev/usr/share/pkgconfig/$(BASE_NAME).pc

-- 
Geographic Resources Analysis Support System