[pkg-db-commits] [db5.3] 03/09: fixup! Re-run dist/s_config to properly call libtool to build on new architectures (Closes: #750481)

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch debian-sid
in repository db5.3.

commit 453de1ad829207d80acb1ae4f11884772ae9ef29
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Jun 19 11:56:36 2014 +0200

    fixup! Re-run dist/s_config to properly call libtool to build on new architectures (Closes: #750481)
---
 debian/rules | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index d46179a..73d46b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,16 +123,20 @@ bdbversion=5.3
 version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
 version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 
+RECONF_FILES=config.hin configure aclocal/libtool.m4 aclocal/ltoptions.m4 \
+	     aclocal/ltversion.m4 config.guess config.sub install-sh ltmain.sh
+
 %:
 	dh $@ --with=autotools-dev $(DH_PLUGINS)
 
 override_dh_auto_configure:
-	mkdir $(CURDIR)/debian/s_config/
-	for f in config.hin configure; do \
+	mkdir $(CURDIR)/debian/s_config/ $(CURDIR)/debian/s_config/aclocal/
+	for f in $(RECONF_FILES); do \
 	  if [ ! $(CURDIR)/debian/s_config/$$f ]; then \
 	    mv $(CURDIR)/dist/$$f $(CURDIR)/debian/s_config/; \
 	  fi; \
 	done
+	libtoolize -cfi
 	cd dist && ./s_config
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	JAVACFLAGS="$(JAVACFLAGS)" dh_auto_configure -Ddist -Bbuild-test -- $(CONFIGURE_SWITCHES) --enable-test
@@ -146,12 +150,12 @@ endif
 	dh_auto_clean -Ddist -Bbuild-production
 	rm -f $(CURDIR)/debian/build_signature.txt
 	mkdir $(CURDIR)/debian/s_config/
-	for f in config.hin configure; do \
+	for f in $(RECONF_FILES); do \
 	  if [ $(CURDIR)/debian/s_config/$$f ]; then \
 	    mv $(CURDIR)/debian/s_config/$$f $(CURDIR)/dist/; \
 	  fi; \
 	done
-	rmdir $(CURDIR)/debian/s_config/
+	rmdir $(CURDIR)/debian/s_config/aclocal/ $(CURDIR)/debian/s_config/
 
 override_dh_auto_test:
 ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(VERY_BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(VERY_BROKEN_SYSTEMS)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-db/db5.3.git