make dist works

diff --git a/.cvsignore b/.cvsignore
new file mode 100644 (file)
index 0000000..799bfca
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,2 @@
+dist_tmp
+userv-utils-*.tar.gz

diff --git a/Makefile b/Makefile
index 2f0b156798826d52cc57618ac9264469b0f737e9..f9550d564c65cc7cef572fce2bcd5e09a0a08f88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,17 +22,19 @@ all:
        echo >&2 'See README.  This is not a unified package.'
 
 distclean:
        echo >&2 'See README.  This is not a unified package.'
 
 distclean:

-       find . -name '*~' -o -name '#*#' -o -name '*.o' -o -name core \
-               -o -name dist_tmp \
-               -print0 | xargs -0r rm --
+       find . \( -name '*~' -o -name '#*#' -o -name '*.o' -o -name core \
+               -o -name dist_tmp -o -name userv-utils-\*.tar.gz \
+               -o -name '.#*' \) \
+               -print0 | xargs -0r rm -rf --

 
 dist_tmp=dist_tmp/userv-utils-$(VERSION)
 
 dist_tmp=dist_tmp/userv-utils-$(VERSION)

+dist_prune=\( -name CVS -o -name 'dist_tmp*' \)

 dist:                  distclean
        rm -rf dist_tmp*
        mkdir dist_tmp $(dist_tmp)
 dist:                  distclean
        rm -rf dist_tmp*
        mkdir dist_tmp $(dist_tmp)

-       find . -name dist_tmp -prune -o -type d -print | \
+       find . $(dist_prune) -prune -o -type d -print | \

                sed -e 's#.*#mkdir -p $(dist_tmp)/&#' | sh
                sed -e 's#.*#mkdir -p $(dist_tmp)/&#' | sh

-       find . -name dist_tmp -prune -o -type f -print | \
+       find . $(dist_prune) -prune -o -type f -print | \

                sed -e 's#.*#ln & $(dist_tmp)/&#' | sh
        cd dist_tmp && tar cf ../$(dist_tmp).tar `basename $(dist_tmp)`
        gzip -9 $(dist_tmp).tar
                sed -e 's#.*#ln & $(dist_tmp)/&#' | sh
        cd dist_tmp && tar cf ../$(dist_tmp).tar `basename $(dist_tmp)`
        gzip -9 $(dist_tmp).tar