Bump version to 7.0.1~iwj0

[chiark-utils.git] / settings.make

diff --git a/settings.make b/settings.make
index 3da848c0be0461df66afaf93e30917ff29399e36..27969c14f319761ab1cf37b96cb43f9a4e55aff2 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -8,7 +8,7 @@
 #
 # This is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2, or (at your option) any later version.
+# Foundation; either version 3, or (at your option) any later version.
 #
 # This is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -16,18 +16,20 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 CONFIG_CPPFLAGS=       -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB) \
-                       -DREALLY_CHECK_FILE='"/etc/inittab"'
+                       -DREALLY_CHECK_FILE='"/etc/inittab"' \
+                       -DREALLY_CHECK_FILE_2='"/etc/rc.local"'
 
 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 +43,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