Reran autoconf.

[userv.git] / Makefile

diff --git a/Makefile b/Makefile
index 32bd0e8e976d3a4ca7f61b5d6bd5d2e471a6c9bc..146e11a34f0391428a3b014880bdd776af10a0db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,13 @@
 #  along with userv; if not, write to the Free Software
 #  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-VERSION=0.58
+VERSION=
 VEREXT=std
 
 CC=gcc
-CFLAGS=-g $(OPTIMISE) -Wall -Wno-implicit -Wwrite-strings -Wpointer-arith -Wimplicit -Wnested-externs -Wmissing-prototypes -Wstrict-prototypes -Werror $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"'
+CFLAGS=-g $(OPTIMISE) -D_GNU_SOURCE -Wall -Wno-implicit -Wwrite-strings -Wpointer-arith -Wimplicit -Wnested-externs -Wmissing-prototypes -Wstrict-prototypes -Werror $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"'
 OPTIMISE=-O2
-CPPFLAGS=-DDEBUG -DVARDIR='"/u/ian/things/userv/vd"' -DSYSTEMCONFIGDIR='"/u/ian/things/userv/slash-etc"' -DSERVICEUSERDIR='"/u/ian/things/userv/tilde"' $(XCPPFLAGS)
+CPPFLAGS=-DDEBUG -DVARDIR='"/u/ian/things/userv-alt/vd"' -DSYSTEMCONFIGDIR='"/u/ian/things/userv-alt/slash-etc"' -DSERVICEUSERDIR='"/u/ian/things/userv-alt/tilde"' $(XCPPFLAGS)
 LDLIBS=-lefence $(XLDLIBS)
 
 M4=m4
@@ -60,7 +60,8 @@ all:          daemon client
 install:       all
                $(INSTALL_PROGRAM) -s -o root -g root -m 755 daemon $(sbindir)/uservd
                $(INSTALL_PROGRAM) -s -o root -g root -m 4755 client $(bindir)/userv
-               $(INSTALL) -d -o root -g root -m 2755 $(etcsubdir)
+               $(INSTALL) -d -o root -g root -m 2755 $(etcsubdir) \
+       $(etcsubdir)/default.d $(etcsubdir)/services.d $(etcsubdir)/override.d
                if ! test -f $(etcsubdir)/system.default; then \
                        $(INSTALL_DATA) -o root -g root system.default $(etcsubdir); fi
                if ! test -f $(etcsubdir)/system.override; then \