Author: frankie
Date: 2009-03-03 17:07:49 +0000 (Tue, 03 Mar 2009)
New Revision: 1956

Modified:
   packages/gdal-grass/trunk/debian/changelog
   packages/gdal-grass/trunk/debian/rules
Log:
Minor changes to debian/rules.


Modified: packages/gdal-grass/trunk/debian/changelog
===================================================================
--- packages/gdal-grass/trunk/debian/changelog  2009-03-03 16:55:18 UTC (rev 
1955)
+++ packages/gdal-grass/trunk/debian/changelog  2009-03-03 17:07:49 UTC (rev 
1956)
@@ -2,8 +2,9 @@
 
   * New upstream release
   * Merged rpath.dpatch from 1.5 branch.
+  * Parameterized debian/rules with respect to gdal and grass versions.
 
- -- Francesco Paolo Lovergine <fran...@debian.org>  Mon, 23 Feb 2009 17:32:04 
+0100
+ -- Francesco Paolo Lovergine <fran...@debian.org>  Tue, 03 Mar 2009 18:06:02 
+0100
 
 libgdal-grass (1.5.4-1) unstable; urgency=low
 

Modified: packages/gdal-grass/trunk/debian/rules
===================================================================
--- packages/gdal-grass/trunk/debian/rules      2009-03-03 16:55:18 UTC (rev 
1955)
+++ packages/gdal-grass/trunk/debian/rules      2009-03-03 17:07:49 UTC (rev 
1956)
@@ -7,14 +7,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export PKGNAME=libgdal1-1.5.0-grass
+PKGNAME=$(shell grep Package: debian/control|cut -d' ' -f2)
+GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
+GDAL=gdal$(subst .,,$(shell gdal-config --version|cut -d. -f1,2))
 
 include /usr/share/dpatch/dpatch.make
 
 config.status: 
        dh_testdir
 
-       ./configure --prefix=/usr --with-grass=/usr/lib/grass64 
--with-autoload=/usr/lib/gdal15plugins
+       ./configure --prefix=/usr --with-grass=/usr/lib/$(GRASS) 
--with-autoload=/usr/lib/$(GDAL)plugins
 
 build: build-stamp
 build-stamp: patch config.status
@@ -38,11 +40,11 @@
        dh_prep
        dh_installdirs
 
-       mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15/grass
-       $(MAKE) install 
AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15plugins \
-                       
GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15/grass
+       mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
+       $(MAKE) install 
AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)plugins \
+                       
GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
        # removes redundant stuff already installed by grass
-       rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15
+       rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)
 
 binary-indep: build install
 # Do nothing
@@ -58,10 +60,11 @@
        dh_fixperms
        dh_makeshlibs
        dh_installdeb
-       dh_shlibdeps -l.:/usr/lib/grass64/lib 
+       dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib 
        dh_gencontrol
        dh_md5sums
        dh_builddeb
 
 binary: binary-arch binary-indep
+
 .PHONY: build clean binary-arch binary-indep binary install


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to