Makefile cleanup

- use git-archive to generate tgz
- make clean better

diff --git a/Makefile b/Makefile
index 3707153b278668b5570784c02075afc12c905407..21552d46b4cf4c5229912df173099190acfac523 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,25 +89,32 @@ src/poll_compat.o: src/poll_compat.h
 tags:
        cscope -I src -b -f .cscope.out src/*.c
 
-tgz:
+oldtgz:
        rm -rf $(TARNAME)
        mkdir -p $(TARNAME)
        tar c $(DIST_FILES) $(SRCS) | tar xp -C $(TARNAME)
-       tar czf $(TARNAME).tar.gz $(TARNAME)
+       tar czf $(TARNAME).tgz $(TARNAME)
+
+tgz:
+       git archive -o $(TARNAME).tar.gz --prefix=$(TARNAME)/ HEAD
+
+clean: tgzclean doc-clean
 
-clean: tgzclean
+doc-clean:
+       $(MAKE) -C doc clean
 
 tgzclean:
        rm -rf $(TARNAME) $(TARNAME).tar.gz
 
 test: install
-       make installcheck || { less regression.diffs; exit 1; }
+       $(MAKE) installcheck || { less regression.diffs; exit 1; }
 
 ack:
        cp results/*.out expected/
 
-mainteiner-clean: clean
+maintainer-clean: clean
        rm -f src/scanner.[ch] src/parser.tab.[ch]
+       rm -rf debian/control debian/rules debian/packages debian/packages-tmp*
 
 deb82:
        sed -e s/PGVER/8.2/g < debian/packages.in > debian/packages