From 37754344f0fb84a201c906c771c1b64ea16a89fc Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 13 Nov 2014 10:01:35 +1100 Subject: [PATCH] packaging: rework dh_autoreconf invocation for deb builds Reviewed, tested and merged the final iteration of proposed solutions to #757455 - resolving configure-script-generation for clean ppc64le builds, originally. Many thanks to Andreas Barth and Matthias Klose for coming up with this solution. Signed-off-by: Nathan Scott Signed-off-by: Dave Chinner --- debian/control | 2 +- debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 7deaf9a27..74b9abcbc 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: XFS Development Team Uploaders: Nathan Scott , Anibal Monsalve Salazar -Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev, autotools-dev +Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev Standards-Version: 3.9.1 Homepage: http://oss.sgi.com/projects/xfs/ diff --git a/debian/rules b/debian/rules index 3e8fa234a..2be2773ce 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ config: .census .census: @echo "== dpkg-buildpackage: configure" 1>&2 $(checkdir) - dh_autotools-dev_updateconfig + AUTOHEADER=/bin/true dh_autoreconf $(options) $(MAKE) include/platform_defs.h touch .census @@ -58,7 +58,7 @@ clean: $(MAKE) distclean -rm -rf $(dirme) $(dirdev) $(dirdi) -rm -f debian/*substvars debian/files* debian/*.debhelper - dh_autotools-dev_restoreconfig + dh_autoreconf_clean dh_clean binary-indep: -- 2.47.2