Finalise 4.4.0

[chiark-utils.git] / settings.make

diff --git a/settings.make b/settings.make
index 52a4f7373b2f164e1d8e61e8bfb5c95dfb5a0ec2..2a0b183d4a7a032a28c2c20de85b999ece31ef2e 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -23,11 +23,12 @@ 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
+               -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign
 OPTIMISE=      -O2
 DEBUG=         -g
 
@@ -48,8 +49,10 @@ mandir=${prefix}/man
 man1dir=${mandir}/man1
 man8dir=${mandir}/man8
 
+# INSTALL_PROGRAM_STRIP_OPT=-s
+
 INSTALL=               install -c
 INSTALL_SHARE=         $(INSTALL) -m 644 -o root -g $(SYSTEM_GROUP)
 INSTALL_SCRIPT=                $(INSTALL) -m 755 -o root -g $(SYSTEM_GROUP)
-INSTALL_PROGRAM=       $(INSTALL_SCRIPT) -s
+INSTALL_PROGRAM=       $(INSTALL_SCRIPT) $(INSTALL_PROGRAM_STRIP_OPT)
 INSTALL_DIRECTORY=     $(INSTALL) -m 2755 -o root -g $(SYSTEM_GROUP) -d