Redo the dist target to use my current rsync method of generating the

distribution tarball.  Rewrite all of the man page generation targets to
be relative to $(srcdir).  Change the code used to extract version
information from krsh and klogin so that it will keep working after a cvs
export.

diff --git a/Makefile.in b/Makefile.in
index a0ca93c85c6d0fd867aa183f1243ad3a2104254f..4619a020c56f726d8d45f132d80f195a838b33f1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,11 @@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
+PACKAGE                = @PACKAGE_TARNAME@
+VERSION                = @PACKAGE_VERSION@
+TARDIR         = $(PACKAGE)-$(VERSION)
+TARNAME                = $(TARDIR).tar
+
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@
 
@@ -26,22 +31,11 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 
 SHELL          = /bin/sh
 
-##############################################################################
-
 COMMON_OBJS    = encrypt.o marsh.o $(LIBOBJS)
 
 SERVER_OBJS    = kftgtd.o $(COMMON_OBJS)
 CLIENT_OBJS    = kftgt.o $(COMMON_OBJS)
 
-SCRIPT_FILES   = klogin krsh
-
-SOURCE_FILES   = encrypt.c encrypt.h kftgt.c kftgt.h kftgtd.c marsh.c \
-                 marsh.h unsetenv.c
-
-EXTRA_FILES    = LICENSE Makefile.in README VERSION configure configure.in \
-                 install-sh kftgt.pod kftgt.1 kftgtd.pod kftgtd.8 klogin.1 \
-                 krsh.1 mkversion
-
 .c.o:
        $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
 
@@ -73,31 +67,37 @@ clean:
 
 distclean: clean
        rm -f config.log config.status config.cache Makefile kftgt-* version.h
+       rm -rf autom4te.cache
 
 maintclean: distclean
        rm -f kftgt.1 kftgtd.8 klogin.1 krsh.1
 
-kftgt.1: kftgt.pod VERSION
-       pod2man --release=`cat VERSION` --center="User Commands" $< > $@
-
-kftgtd.8: kftgtd.pod VERSION
-       pod2man -s 8 --release=`cat VERSION` --center="System Daemons" $< > $@
-
-klogin.1: klogin
-       pod2man --release=`awk '/Id: / { print $$5; exit }' klogin` \
-           --center="User commands" $< > $@
-
-krsh.1: krsh
-       pod2man --release=`cat VERSION` --center="User commands" $< > $@
-
-dist: $(SCRIPT_FILES) $(SOURCE_FILES) $(EXTRA_FILES)
-       mkdir kftgt-`cat VERSION`
-       cp $(SOURCE_FILES) kftgt-`cat VERSION`
-       cp $(SCRIPT_FILES) kftgt-`cat VERSION`
-       cp $(EXTRA_FILES) kftgt-`cat VERSION`
-       tar cf kftgt-`cat VERSION`.tar kftgt-`cat VERSION`
-       gzip -9 kftgt-`cat VERSION`.tar
-       rm -rf kftgt-`cat VERSION`
+$(srcdir)/kftgt.1: $(srcdir)/kftgt.pod VERSION
+       pod2man --release=`cat VERSION` --center="User Commands" \
+           $(srcdir)/kftgt.pod > $@
+
+$(srcdir)/kftgtd.8: $(srcdir)/kftgtd.pod VERSION
+       pod2man -s 8 --release=`cat VERSION` --center="System Daemons" \
+           $(srcdir)/kftgtd.pod > $@
+
+$(srcdir)/klogin.1: $(srcdir)/klogin
+       pod2man --release=`$(srcdir)/klogin -v | awk '{ print $$2 }'` \
+           --center="User commands" $(srcdir)/klogin > $@
+
+$(srcdir)/krsh.1: $(srcdir)/krsh
+       pod2man --release=`$(srcdir)/krsh -v | awk '{ print $$2 }'` \
+           --center="User commands" $(srcdir)/krsh > $@
+
+dist: $(srcdir)/kftgt.1 $(srcdir)/kftgtd.8 $(srcdir)/klogin.1 $(srcdir)/krsh.1
+       rm -rf $(TARNAME).gz $(TARNAME).gz.md5 $(TARDIR)
+       mkdir $(TARDIR)
+       rsync -C --exclude /debian/ -a $(srcdir)/ $(TARDIR)/
+       rsync -a $(srcdir)/kftgt.1 $(srcdir)/kftgtd.8 $(srcdir)/klogin.1 \
+           $(srcdir)/krsh.1 $(TARDIR)/
+       cd $(TARDIR) && autoconf && rm -rf autom4te.cache
+       tar cf $(TARNAME) $(TARDIR)
+       gzip -9 $(TARNAME)
+       md5sum $(TARNAME).gz > $(TARNAME).gz.md5
 
 # Dependencies.
 encrypt.o: encrypt.c kftgt.h version.h