Add debian/patches/fix-autoreconf.patch

3 files changed, 30 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 8bc185ae..96be9d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ pam (1.3.1-1) UNRELEASED; urgency=medium
 
   [ Andreas Henriksson ]
   * Update debian/libpam0g.symbols
+  * debian/patches-applied/fix-autoreconf.patch: Do not override user
+    variables in Makefile.am
 
  -- Steve Langasek <vorlon@debian.org>  Wed, 23 Jan 2019 14:44:20 +0000
 
diff --git a/debian/patches-applied/fix-autoreconf.patch b/debian/patches-applied/fix-autoreconf.patch
new file mode 100644
index 00000000..037f7ff8
--- /dev/null
+++ b/debian/patches-applied/fix-autoreconf.patch
@@ -0,0 +1,27 @@
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Thu, 8 Nov 2018 19:09:21 +0100
+Subject: fix-autoreconf.patch
+
+Do not override user variables in Makefile.am, see the
+"Flag Variables Ordering" section of the automake manual.
+---
+ doc/specs/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/specs/Makefile.am b/doc/specs/Makefile.am
+index 99ecc70..b94e5ef 100644
+--- a/doc/specs/Makefile.am
++++ b/doc/specs/Makefile.am
+@@ -12,9 +12,9 @@ draft-morgan-pam-current.txt: padout draft-morgan-pam.raw
+ AM_YFLAGS = -d
+ 
+ CC = @CC_FOR_BUILD@
+-CPPFLAGS = @BUILD_CPPFLAGS@
+-CFLAGS = @BUILD_CFLAGS@
+-LDFLAGS = @BUILD_LDFLAGS@
++AM_CPPFLAGS = @BUILD_CPPFLAGS@
++AM_CFLAGS = @BUILD_CFLAGS@
++AM_LDFLAGS = @BUILD_LDFLAGS@
+ 
+ BUILT_SOURCES = parse_y.h
+ 
diff --git a/debian/patches-applied/series b/debian/patches-applied/series
index ea529795..d5318db2 100644
--- a/debian/patches-applied/series
+++ b/debian/patches-applied/series
@@ -22,3 +22,4 @@ update-motd
 no_PATH_MAX_on_hurd
 lib_security_multiarch_compat
 pam-limits-nofile-fd-setsize-cap
+fix-autoreconf.patch