X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=settings.make;h=495b2b3f855b47d716d59929186d61ee5079bdf4;hp=52a4f7373b2f164e1d8e61e8bfb5c95dfb5a0ec2;hb=824a6065e4f177255e68076fbda619661c905063;hpb=506a099cb9d0200b394d19c17d6dc9a3478b9917

diff --git a/settings.make b/settings.make
index 52a4f73..495b2b3 100644
--- 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
 
@@ -41,15 +42,20 @@ confdir=$(etcdir)/$(us)
 bindir=$(prefix)/bin
 sbindir=$(prefix)/sbin
 sharedir=$(prefix)/share/$(us)
+perl5dir=$(prefix)/share/perl5
 txtdocdir=$(prefix)/share/doc/$(us)
+python2dir=$(prefix)/lib/python2.7/dist-packages
+python3dir=$(prefix)/lib/python3/dist-packages
 exampledir=$(txtdocdir)/examples
 vardir=$(varlib)/$(us)
 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