[SCM] grass branch, master, updated. upstream/6.4.0-23-g3a56bef

Francesco Paolo Lovergine frankie at debian.org
Wed Apr 13 16:05:21 UTC 2011


The following commit has been merged in the master branch:
commit 36f9d25cb85087ef422c38ca1e62f7f3388d484e
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Apr 13 16:42:56 2011 +0200

    Added wxvdigit support still missing in 6.4.0+

diff --git a/debian/rules b/debian/rules
index d34a75e..2882a55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,6 +88,8 @@ build-stamp:
 	dh_testdir
 	$(MAKE) 
 	chmod 755 debian/fixpaths.sh debian/fixscripts.sh
+	# build vdigit too
+	$(MAKE) -C gui/wxpython/vdigit
 	touch $@
 
 # This target generates truly arch-indep stuff
@@ -147,9 +149,16 @@ install: build
 
 	# install grass core into debian/tmp
 	$(MAKE) $(STRIP)
-	$(MAKE) install INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
+	$(MAKE) install \
+		INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
 		PREFIX=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
 		BINDIR=$(CURDIR)/debian/tmp/usr/bin
+	# install vdigit
+	$(MAKE) -C gui/wxpython/vdigit install \
+		INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
+		PREFIX=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
+		BINDIR=$(CURDIR)/debian/tmp/usr/bin
+
 
 	# fix all the braindead scripts
 	debian/fixscripts.sh

-- 
Geographic Resources Analysis Support System



More information about the Pkg-grass-devel mailing list