Makefile: honour CMDLINE_CFLAGS, CMDLINE_CPPFLAGS, CMDLINE_LDFLAGS.

diff --git a/debian/changelog b/debian/changelog
index 2219cc917359fbda7349877e0b81e296c6bd9645..376be02d5abb6dadee8f85032e8ef9d3a04c144a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ chiark-utils (4.3.0) unstable; urgency=medium
   * watershed; Provide -h and --help options.  Closes:#659989.
 
   Build and portability fixes:
+  * Makefile: honour CMDLINE_CFLAGS, CMDLINE_CPPFLAGS, CMDLINE_LDFLAGS.
   * xbatmon-simple: Saner build rune.
   * cprogs/Makefile: clean deletes $PROGRAMS
   * random-word: Some perl-mode emacs formatting glitch workarounds.

diff --git a/settings.make b/settings.make
index 5471dbde761c809860e76fb9e255bd480fe8ed71..2a0b183d4a7a032a28c2c20de85b999ece31ef2e 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -23,8 +23,9 @@ CONFIG_CPPFLAGS=      -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB) \
                        -DREALLY_CHECK_FILE='"/etc/inittab"'
 
 CC=            gcc
-CFLAGS=                $(WARNINGS) $(OPTIMISE) $(DEBUG)
-CPPFLAGS=      $(CONFIG_CPPFLAGS)
+CFLAGS=                $(WARNINGS) $(OPTIMISE) $(DEBUG) $(CMDLINE_CFLAGS)
+CPPFLAGS=      $(CONFIG_CPPFLAGS) $(CMDLINE_CPPFLAGS)
+LDFLAGS=       $(CMDLINE_LDFLAGS)
 
 WARNINGS=      -Wall -Wwrite-strings -Wmissing-prototypes \
                -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign