X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=blobdiff_plain;f=settings.make;h=feb1dcbf3c4bbf0802211524eb422f5d4a0bb6ef;hp=bd9313c6d56526c282b77589c08b6d15bd9ecbcf;hb=9f8946ddeb2b7851502eccb460e5d15845c2fc7e;hpb=711a074884724fb201f5e23d2256d7ea7f5ecaef

diff --git a/settings.make b/settings.make
index bd9313c..feb1dcb 100644
--- a/settings.make
+++ b/settings.make
@@ -1,10 +1,14 @@
 # common makefile settings for userv-utils
 
-# Copyright (C) 1999-2000,2003 Ian Jackson
+# Copyright 1996-2013,2016 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
 #
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -13,14 +17,12 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with userv-utils; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 etcdir=		/etc
 prefix=		/usr/local
 bindir=		$(prefix)/bin
+sbindir=	$(prefix)/sbin
 vardir=		/var
 
 libdir=		$(prefix)/lib
@@ -30,6 +32,7 @@ docdir=		$(sharedir)/doc
 
 libuserv=	$(libdir)/userv
 shareuserv=	$(sharedir)/userv
+varlog=		$(vardir)/log
 varlib=		$(vardir)/lib
 varlibuserv=	$(varlib)/userv
 
@@ -37,10 +40,12 @@ etcuserv=	$(etcdir)/userv
 services=	$(etcuserv)/services.d
 
 CFLAGS=	-Wall -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes \
-	-Wpointer-arith -D_GNU_SOURCE \
+	-Wpointer-arith -D_GNU_SOURCE -Wno-pointer-sign \
 	$(OPTIMISE) $(DEBUG) $(SUBDIR_CFLAGS)
-LDFLAGS= $(SUBDIR_LDFLAGS)
+LDFLAGS= $(SUBDIR_LDFLAGS) $(DEBUG)
 
 OPTIMISE=	-O2
 DEBUG=		-g
 
+depr ?=		disable
+# set depr to '' to enable deprecated output