X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=Makefile.in;h=88d8bb5c8c96dd183ccb0c47aa38dec8dffc4a49;hp=6bf4ea49dc672e353294080f66646307b0fa8387;hb=d237116707105a3ca6cf367a672bc5263cf7856d;hpb=b6c671fd90134d458ad4722ec3a99742bced1a34

diff --git a/Makefile.in b/Makefile.in
index 6bf4ea4..88d8bb5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 #  userv - Makefile.in
 #  
-#  Copyright (C)1996-1997 Ian Jackson
+#  Copyright (C)1996-1997,1999 Ian Jackson
 #  
 #  This is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 @@ VERSION=@VERSION@
 VEREXT=std
 
 CC=@CC@
-CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"'
+CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR)
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
-LDLIBS=@DEBUGLIBS@ $(XLDLIBS)
+LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 
 M4=m4
 M4FLAGS=
@@ -61,9 +61,9 @@ install:	all
 		$(INSTALL_PROGRAM) -s -o root -g root -m 4755 client $(bindir)/userv
 		$(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 \
+		if test ! -f $(etcsubdir)/system.default; then \
 			$(INSTALL_DATA) -o root -g root system.default $(etcsubdir); fi
-		if ! test -f $(etcsubdir)/system.override; then \
+		if test ! -f $(etcsubdir)/system.override; then \
 			$(INSTALL_DATA) -o root -g root system.override $(etcsubdir); fi
 
 daemon:		overlord.o process.o servexec.o parserlexer.o debug.o lib.o both.o
@@ -95,7 +95,7 @@ parserlexer.o:	lexer.c parser.c config.h common.h pcsum.h daemon.h lib.h tokens.
 		$(CC) -c $(CPPFLAGS) $(CFLAGS) lexer.c -o $@
 
 pcsum.h:	common.h config.h config.status Makefile
-		cat $^ | md5sum | sed -e 's/../0x&,/g; s/,$$//;' >pcsum.h.new
+		cat $^ | md5sum | sed -e 's/  -$$//; s/../0x&,/g; s/,$$//;' >pcsum.h.new
 		cmp pcsum.h.new pcsum.h || mv -f pcsum.h.new pcsum.h
 		@rm -f pcsum.h.new