From d71b7fbdfa6a07d185ddff4916a85f6df8702497 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 14 Dec 2016 20:25:18 -0500 Subject: [PATCH] Use dh_auto_configure Signed-off-by: Anders Kaseorg --- debian/changelog | 1 + debian/rules | 20 +++----------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d616f453..9f9ee267a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ openafs (1.8.0~pre1-3) UNRELEASED; urgency=medium * Replace hard-coded x86_64-linux-gnu with DEB_HOST_MULTIARCH. + * Use dh_auto_configure. -- Anders Kaseorg Wed, 14 Dec 2016 20:12:48 -0500 diff --git a/debian/rules b/debian/rules index 0e04a4011..d620ee3a7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,7 @@ #!/usr/bin/make -f -# Tell Autoconf the correct system types. DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - SYSTEM = --build $(DEB_HOST_GNU_TYPE) -else - SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -# Set compiler flags. -CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) # Determine whether we're building with optimization. This doesn't really # work at the moment due to upstream problems. @@ -97,11 +85,9 @@ override_dh_auto_configure: rm -f doc/man-pages/man1/up.1 sh regen.sh afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local \ - sh configure \ - CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \ + dh_auto_configure -- \ --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --sysconfdir=/etc --libexecdir=/usr/lib \ + --libdir=\$${prefix}/lib --libexecdir=\$${prefix}/lib \ --localstatedir=/var/lib --enable-supergroups \ --enable-fuse-client --enable-debug --enable-debug-lwp \ --with-docbook2pdf=dblatex --with-xslt-processor=xsltproc \ @@ -112,7 +98,7 @@ override_dh_auto_configure: --with-roken-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal \ --with-hcrypto-include=/usr/include/heimdal \ --with-hcrypto-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal \ - $(DEBIAN_OPT_FLAGS) $(SYSTEM) + $(DEBIAN_OPT_FLAGS) # Also build a libafs_tree and build the XML documentation if building # architecture-independent packages. -- 2.39.5