X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=settings.make;h=495b2b3f855b47d716d59929186d61ee5079bdf4;hb=0611570e12b80265e42866797afc392057ca633f;hp=d008a354adf29fdd1404c3b18a6f7e57038541da;hpb=76415873c03f50b8d952db149fe5b6b7eda09a05;p=chiark-utils.git

diff --git a/settings.make b/settings.make
index d008a35..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,7 +42,10 @@ 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