Simplify make dist hook. Omit etc/masterkey content from distribution.

diff --git a/Makefile.am b/Makefile.am
index 41d7dbe..1da67c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.13 2007-06-20 14:11:41 adam Exp $
+# $Id: Makefile.am,v 1.14 2007-07-16 12:31:09 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
@@ -9,19 +9,11 @@ EXTRA_DIST = README NEWS LICENSE buildconf.sh Doxyfile.in m4/yaz.m4
 
 dist-hook:
        if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; cp ChangeLog $(distdir); fi
-       cp -r $(srcdir)/etc $(distdir)
-       cvs=`find $(distdir)/etc -name CVS -type d -print`; if test "$$cvs"; then rm -r $$cvs; fi
-       mkdir -p $(distdir)/www/test1
-       for f in $(srcdir)/www/test1/*; do \
-               test -f $$f && cp $$f $(distdir)/www/test1; \
-       done; exit 0
-       mkdir -p $(distdir)/www/jsdemo
-       for f in $(srcdir)/www/jsdemo/*; do \
-               test -f $$f && cp $$f $(distdir)/www/jsdemo; \
-       done; exit 0
-       mkdir $(distdir)/debian
-       for f in $(srcdir)/debian/*; do \
-               test -f $$f && cp $$f $(distdir)/debian; \
+       for d in etc etc/settings www/test1 www/jsdemo debian; do \
+               mkdir -p $(distdir)/$$d; \
+               for f in $(srcdir)/$$d/*; do \
+                       test -f $$f && cp $$f $(distdir)/$$d; \
+               done; \
        done; exit 0
 
 cvs2cl: