Do not have Makefile in CVS.

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 146e11a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,157 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-#  userv - Makefile.in
-#  
-#  Copyright (C)1996-1997 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
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#  
-#  This program is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#  
-#  You should have received a copy of the GNU General Public License
-#  along with userv; if not, write to the Free Software
-#  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-VERSION=
-VEREXT=std
-
-CC=gcc
-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-alt/vd"' -DSYSTEMCONFIGDIR='"/u/ian/things/userv-alt/slash-etc"' -DSERVICEUSERDIR='"/u/ian/things/userv-alt/tilde"' $(XCPPFLAGS)
-LDLIBS=-lefence $(XLDLIBS)
-
-M4=m4
-M4FLAGS=
-LEX=flex
-CWD=$(shell pwd)
-
-INSTALL=/usr/bin/install -c
-INSTALL_PROGRAM=${INSTALL}
-INSTALL_DATA=${INSTALL} -m 644
-prefix=/usr/local
-exec_prefix=$(prefix)
-bindir=$(exec_prefix)/bin
-sbindir=$(exec_prefix)/sbin
-etcdir=/etc
-etcsubdir=$(etcdir)/userv
-
-SOURCES=       Makefile.in configure.in acconfig.h                     \
-               client.c common.h                                       \
-               overlord.c process.c servexec.c                         \
-               daemon.h debug.c parser.c lib.c lib.h                   \
-               language.i4 lexer.l.m4 tokens.h.m4
-ALSOSHIP=      README INSTALL Changelog COPYING \
-               system.default system.override \
-               spec.sgml.in overview.fig overview.ps \
-               buildship install-sh .cvsignore
-GENSHIP=       lexer.l lexer.c tokens.h configure config.h.in \
-               spec.sgml spec.html spec.ps overview.ps
-
-SHIPTARGETS=   $(SOURCES) $(ALSOSHIP) $(GENSHIP)
-
-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) \
-       $(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 \
-                       $(INSTALL_DATA) -o root -g root system.override $(etcsubdir); fi
-
-daemon:                overlord.o process.o servexec.o parserlexer.o debug.o lib.o
-               $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-lexer.l:       language.i4
-
-spec.sgml:     spec.sgml.in Makefile
-               sed -e '/<version><\/version>/ s/>/&$(VERSION)/' \
-                       spec.sgml.in >$@.new && mv -f $@.new $@
-
-client.o:      config.h common.h pcsum.h version.h
-
-process.o:     config.h common.h pcsum.h daemon.h lib.h tokens.h
-
-overlord.o:    config.h common.h pcsum.h daemon.h
-
-servexec.o:    config.h common.h pcsum.h daemon.h lib.h version.h
-
-lib.o:         config.h common.h lib.h
-
-debug.o:       config.h common.h pcsum.h daemon.h lib.h tokens.h
-
-parserlexer.o: lexer.c parser.c config.h common.h pcsum.h daemon.h lib.h tokens.h
-# lexer.c #include's parser.c at the end.  Blame flex.
-               $(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
-               cmp pcsum.h.new pcsum.h || mv -f pcsum.h.new pcsum.h
-               @rm -f pcsum.h.new
-
-version.h:     Makefile
-               echo '#define VERSION "$(VERSION)"' >$@.new && mv -f $@.new $@
-
-tokens.h:      language.i4
-
-autoconf configure:
-               autoheader
-               autoconf
-
-clean:
-               rm -f daemon client pcsum.h
-               rm -f overview.eps
-               rm -f spec.lout* spec.text* spec.sgml spec.sgml.new spec.ps?*
-               rm -rf spec.html?*
-               rm -f lout.li *.lix *.ldx config.cache
-               rm -f *.o *~ core ./#*#
-
-distclean:     clean
-               rm -f config.status config.log Makefile config.h
-
-realclean:     distclean
-               rm -f spec.ps* spec.sgml spec.sgml.new
-               rm -f lexer.l lexer.c tokens.h overview.ps
-               rm -rf spec.html*
-
-totalclean:    realclean
-               rm -f configure config.h.in
-
-shipprep:      $(SHIPTARGETS)
-
-ship:          $(SHIPTARGETS)
-               rm -rf shipcheck
-               mkdir -p shipcheck/userv-$(VERSION)
-               cp -a $^ shipcheck/userv-$(VERSION)
-               cd shipcheck && \
-                GZIP=-9v tar zvvcf userv-$(VERSION).tar.gz userv-$(VERSION)
-               rm -rf shipcheck/userv-$(VERSION)
-
-linecount:     $(SOURCES)
-               wc -l $^
-
-%.html:                %.sgml
-               rm -rf $@; debiandoc2html $<
-
-%.ps:          %.sgml
-               debiandoc2ps -1 -O $< >$@.new && mv $@.new $@
-
-%.ps:          %.fig
-               fig2dev -L ps -c -l dummy -P -z A4 $< >$@.new && mv $@.new $@
-
-%.l:           %.l.m4
-               $(M4) $(M4FLAGS) -- $< >$@.new && mv $@.new $@
-
-%.h:           %.h.m4
-               $(M4) $(M4FLAGS) -- $< >$@.new && mv $@.new $@
-
-%:             %.m4
-               $(M4) $(M4FLAGS) -- $< >$@.new && mv $@.new $@

diff --git a/configure b/configure
index f284b20fefa6a664bf2287d58f3028998957875e..013782f86c8cfe80ba0da56024d027f9d01fd147 100755 (executable)
--- a/configure
+++ b/configure
@@ -1306,7 +1306,7 @@ fi
 CFLAGS="`echo $CFLAGS $CWARNS | sed -e 's/-O[0-9]*/$(OPTIMISE)/'`"
 
 
-VERSION="`sed -n '/^userv (.*)/!d; s/^userv (//; s/).*//; p; q' Changelog`"
+VERSION="`sed -n '/^userv (.*)/!d; s/^userv (//; s/).*//; p; q' debian/changelog`"
 echo will build version $VERSION
 
 trap '' 1 2 15