[pkg-db-commits] [db5.3] 01/09: 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 59b6d4c7c335eca6b6e3e82d45a22c5c047bbae4
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Jun 19 11:11:36 2014 +0200

    Re-run dist/s_config to properly call libtool to build on new architectures (Closes: #750481)
---
 debian/control |  1 +
 debian/rules   | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/control b/debian/control
index fc83a63..743b21e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Standards-Version: 3.9.3
 # gcj-native-helper can be dropped
 Build-Depends: debhelper (>= 9),
 	       autotools-dev (>= 20100122.1),
+	       dh-autoreconf,
 	       tcl-dev,
 	       procps [!hurd-i386],
 	       javahelper,
diff --git a/debian/rules b/debian/rules
index 313799a..d46179a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,6 +127,13 @@ version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 	dh $@ --with=autotools-dev $(DH_PLUGINS)
 
 override_dh_auto_configure:
+	mkdir $(CURDIR)/debian/s_config/
+	for f in config.hin configure; do \
+	  if [ ! $(CURDIR)/debian/s_config/$$f ]; then \
+	    mv $(CURDIR)/dist/$$f $(CURDIR)/debian/s_config/; \
+	  fi; \
+	done
+	cd dist && ./s_config
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	JAVACFLAGS="$(JAVACFLAGS)" dh_auto_configure -Ddist -Bbuild-test -- $(CONFIGURE_SWITCHES) --enable-test
 endif
@@ -138,6 +145,13 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 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 \
+	  if [ $(CURDIR)/debian/s_config/$$f ]; then \
+	    mv $(CURDIR)/debian/s_config/$$f $(CURDIR)/dist/; \
+	  fi; \
+	done
+	rmdir $(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