Upstream Makefiles: Honour XCFLAGS.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile.in b/Makefile.in
index 7ef52c267b5620fdfa26c79e5b6636b556edac09..d36c6c6eae8f77a0d8bf1267a8eb245cc121ccad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ VERSION=@VERSION@
 VEREXT=std
 
 CC=@CC@
 VEREXT=std
 
 CC=@CC@

-CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR)
+CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR) $(XCFLAGS)

 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
 LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
 LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)

diff --git a/debian/changelog b/debian/changelog
index 946e58de89752fd59e0cd6f0a9ba35fd08892dba..547cdcd03064850adb433055e073008744cc69a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 userv (1.1.2~~iwj1) unstable; urgency=low
 
 userv (1.1.2~~iwj1) unstable; urgency=low
 

+  Upstream Makefiles:
+  * Honour XCFLAGS.
+

   Debian packaging:
   * Add some newer debian/ droppings to .gitignore.
 
   Debian packaging:
   * Add some newer debian/ droppings to .gitignore.