* Reworked debian/rules to make it a bit clearer what happens.

diff --git a/debian/changelog b/debian/changelog
index 4197e90ee1650f02b60103bb3095b32d93a5a0f9..d978a069e79b2c76a73ebad9323b0761887a61a6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ tclcurl (7.17.1-1) unstable; urgency=low
     the correct-linking patch to kerberos related libs.
   * Switched to use tcltk-depends to depend on the right Tcl version.
   * Added Vcs-Svn field to debian/control.
+  * Reworked debian/rules to make it a bit clearer what happens.
   
- -- Sven Hoexter <sven@timegate.de>  Sat, 15 Dec 2007 15:21:37 +0100
+ -- Sven Hoexter <sven@timegate.de>  Tue, 25 Dec 2007 19:56:19 +0100
 
 tclcurl (7.16.2-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 48d1e8424f897987ec2fd6df7fad64d45a4f82b6..1045a76ef37836e5433b466197499bdda99fc1a5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,19 +5,40 @@
 
 include /usr/share/quilt/quilt.make
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+        CONFIGURE_OPTIONS += --build $(DEB_HOST_GNU_TYPE)
+else
+        CONFIGURE_OPTIONS += --build $(DEB_BUILD_GNU_TYPE) \
+                --host $(DEB_HOST_GNU_TYPE)
+endif
 
-configure: patch configure-stamp
-configure-stamp:
-       dh_testdir
-       ./configure \
-       --host=${DEB_HOST_GNU_TYPE} \
-       --build=${DEB_BUILD_GNU_TYPE} \
+
+CONFIGURE_OPTIONS += \
        --prefix=/usr \
        --mandir=/usr/share/man \
        --infodir=/usr/share/info \
        --enable-threads
+
+
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+
+CFLAGS += -Wall -g
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O2
+else
+        CFLAGS += -O0
+endif
+
+
+configure: patch configure-stamp
+configure-stamp:
+       dh_testdir
+
+        CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+        ./configure $(CONFIGURE_OPTIONS)
+
        touch configure-stamp
 
 build: configure build-stamp
@@ -39,7 +60,7 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-       $(MAKE) DESTDIR=`pwd`/debian/tmp install
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tclcurl
        dh_movefiles
 
 # Build architecture-independent files here.
@@ -51,7 +72,6 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installdocs Changes.txt
-       dh_installexamples
        dh_installman
        dh_installchangelogs ChangeLog.txt
        dh_link