[DebianGIS-dev] r1642 - packages/gmt/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-06-14 08:33:38 +0000 (Sat, 14 Jun 2008)
New Revision: 1642

Modified:
   packages/gmt/trunk/debian/changelog
   packages/gmt/trunk/debian/rules
Log:
More cleanups


Modified: packages/gmt/trunk/debian/changelog
===================================================================
--- packages/gmt/trunk/debian/changelog	2008-06-13 20:33:14 UTC (rev 1641)
+++ packages/gmt/trunk/debian/changelog	2008-06-14 08:33:38 UTC (rev 1642)
@@ -22,8 +22,10 @@
   * Moved to libnetcdf-dev instead of old netcdfg-dev now obsolete.
   * Build-dep on c-shell removed, because not more required.
   * Long description revised.
+  * CC_OPT is not more used in building, uses CFLAGS instead. 
+  * Added symlink to all *.conf files in /etc within /usr/share/gmt.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 13 Jun 2008 21:01:30 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 14 Jun 2008 00:03:01 +0200
 
 gmt (4.2.1-1) unstable; urgency=low
 

Modified: packages/gmt/trunk/debian/rules
===================================================================
--- packages/gmt/trunk/debian/rules	2008-06-13 20:33:14 UTC (rev 1641)
+++ packages/gmt/trunk/debian/rules	2008-06-14 08:33:38 UTC (rev 1642)
@@ -4,6 +4,21 @@
 PARTS		:= pdf src share scripts suppl tut web
 ARCHIVES	:= $(PARTS:%=upstream/GMT$(RELEASE)_%.tar.bz2)
 
+CFLAGS := -fPIC -ansi -pedantic
+
+# Some special build options
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+   CFLAGS += -g -O0
+   LDFLAGS += -g
+else
+   CFLAGS += -O2
+endif
+
+ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
+   DH_VERBOSE=1
+   export DH_VERBOSE
+endif
+
 unpack:		stamps/unpack-stamp
 patch:		stamps/patch-stamp
 build:		stamps/build-stamp
@@ -53,7 +68,7 @@
 	dh_testdir
 	cd GMT$(RELEASE) && ./configure \
 		--enable-shared $(PATHCONFIG) --disable-mex --enable-netcdf=/usr
-	$(MAKE) -C GMT$(RELEASE) CC_OPT="-fPIC -g -O2 -ansi -pedantic" LDFLAGS="-g" all suppl 
+	$(MAKE) -C GMT$(RELEASE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" all suppl 
 	touch $@
 
 stamps/install-stamp: stamps/build-stamp
@@ -88,9 +103,8 @@
 
 	# Configuration files are still at the wrong place, let's fix this
 	mv $(DESTDIR)/usr/share/gmt/conf/*.conf $(DESTDIR)/etc/gmt/
-	ln -fs /etc/gmt/gmt.conf $(DESTDIR)/usr/share/gmt/
 	install -m644 debian/coastline.conf $(DESTDIR)/etc/gmt/
-	ln -fs /etc/gmt/coastline.conf $(DESTDIR)/usr/share/gmt/
+	ln -fs /etc/gmt/*.conf $(DESTDIR)/usr/share/gmt/
 
 	# GMT wrapper does not help in /usr/lib/gmt/bin (not in path by default)
 	# So: Move it to /usr/bin and patch it a bit locally to alter the PATH var