[pkg-db-commits] [db5.3] 07/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 522278078698bbbc541763666df96c0cc056ce9f
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Jun 19 12:10:42 2014 +0200

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

diff --git a/debian/rules b/debian/rules
index f5fd4c6..b88d221 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,7 +130,9 @@ RECONF_FILES=config.hin configure aclocal/libtool.m4 aclocal/ltoptions.m4 \
 	dh $@ --with=autotools-dev $(DH_PLUGINS)
 
 override_dh_auto_configure:
-	mkdir $(CURDIR)/debian/s_config/ $(CURDIR)/debian/s_config/aclocal/
+	if [ ! -d $(CURDIR)/debian/s_config ]; then \
+	  mkdir $(CURDIR)/debian/s_config/ $(CURDIR)/debian/s_config/aclocal/; \
+	fi
 	for f in $(RECONF_FILES); do \
 	  if [ ! $(CURDIR)/debian/s_config/$$f ]; then \
 	    mv $(CURDIR)/dist/$$f $(CURDIR)/debian/s_config/; \
@@ -149,13 +151,12 @@ 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 $(RECONF_FILES); do \
 	  if [ -e $(CURDIR)/debian/s_config/$$f ]; then \
 	    mv $(CURDIR)/debian/s_config/$$f $(CURDIR)/dist/; \
 	  fi; \
 	done
-	if [ -f $(CURDIR)/debian/s_config/]; then \
+	if [ -f $(CURDIR)/debian/s_config/ ]; then \
 	  rmdir -f $(CURDIR)/debian/s_config/aclocal/ $(CURDIR)/debian/s_config/; \
 	fi
 

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