From 98977bfc1c0c698bc74c13d73042c2727bc61fed Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Tue, 25 Dec 2007 18:57:36 +0000 Subject: [PATCH] * Reworked debian/rules to make it a bit clearer what happens. --- debian/changelog | 3 ++- debian/rules | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4197e90..d978a06 100644 --- 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 Sat, 15 Dec 2007 15:21:37 +0100 + -- Sven Hoexter 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 48d1e84..1045a76 100755 --- 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 -- 2.39.5