X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=settings.make;h=2a0b183d4a7a032a28c2c20de85b999ece31ef2e;hp=37e41abf624e5eb2da8e7277abafce5a7da264f5;hb=dfbd234c7f11ce1aaa49937f1313a8214505c735;hpb=2c444eebd71ff12a6c29ffaa91d2e716c8f9ca6e diff --git a/settings.make b/settings.make index 37e41ab..2a0b183 100644 --- 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,15 +16,19 @@ # 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"' CC= gcc -CFLAGS= $(WARNINGS) $(OPTIMISE) $(DEBUG) -CPPFLAGS= -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB) +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 @@ -45,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