chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: finalise 5.0.3~citrix1
[chiark-utils.git]
/
settings.make
diff --git
a/settings.make
b/settings.make
index d008a354adf29fdd1404c3b18a6f7e57038541da..ff917b18392e26f16f2a26624e691f6461588ad8 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
-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 \
WARNINGS= -Wall -Wwrite-strings -Wmissing-prototypes \
- -Wstrict-prototypes -Wpointer-arith
+ -Wstrict-prototypes -Wpointer-arith
-Wno-pointer-sign
OPTIMISE= -O2
DEBUG= -g
OPTIMISE= -O2
DEBUG= -g
@@
-41,6
+42,7
@@
confdir=$(etcdir)/$(us)
bindir=$(prefix)/bin
sbindir=$(prefix)/sbin
sharedir=$(prefix)/share/$(us)
bindir=$(prefix)/bin
sbindir=$(prefix)/sbin
sharedir=$(prefix)/share/$(us)
+perl5dir=$(prefix)/share/perl5
txtdocdir=$(prefix)/share/doc/$(us)
exampledir=$(txtdocdir)/examples
vardir=$(varlib)/$(us)
txtdocdir=$(prefix)/share/doc/$(us)
exampledir=$(txtdocdir)/examples
vardir=$(varlib)/$(us)