Remove CVS dirs from distributions.

diff --git a/distdir/autodist b/distdir/autodist
index 93a8df45e613bf303674d90af61f82aca561601e..174c282892b1cee0a2d992beb9d460c5eee464b6 100644 (file)
--- a/distdir/autodist
+++ b/distdir/autodist
@@ -18,3 +18,7 @@ exclude apps/autodist/TODO apps/autodist/CHANGES
 exclude README.* ltmain.sh
 
 noprocess apps/autodist/doc apps/autodist/tests
+
+post-process-dist-hook distdir/post-process-dist
+post-dist-hook distdir/post-dist
+

diff --git a/distdir/client b/distdir/client
index 2e92c8c5293c8bf6dd936fc4c1b4990cf50b823b..13f35fefcf47a67b51450cdcf1378a583754e621 100644 (file)
--- a/distdir/client
+++ b/distdir/client
@@ -1,8 +1,11 @@
 name Client
 package silc-client
 bug-report silc-devel@lists.silcnet.org
+
 inherit common
 define SILC_DIST_CLIENT
 define SILC_DIST_CLIENTLIB
+
 pre-hook distdir/pre-run
+post-process-dist-hook distdir/post-process-dist
 post-dist-hook distdir/post-dist

diff --git a/distdir/post-dist b/distdir/post-dist
index e53ca6ff9340c00ef5dafd99bd42cd95d2f681f7..c026866e1abbe260c59e36bea4bf3c4e3702fafe 100644 (file)
--- a/distdir/post-dist
+++ b/distdir/post-dist
@@ -6,9 +6,9 @@ package=$3
 distdir=$4
 
 if test -f $distdir.tar.gz; then
-  md5sum $distdir.tar.gz > distdir.tar.gz.md5
+  md5sum $distdir.tar.gz > $distdir.tar.gz.md5
 fi
 if test -f $distdir.tar.bz2; then
-  md5sum $distdir.tar.bz2 > distdir.tar.bz2.md5
+  md5sum $distdir.tar.bz2 > $distdir.tar.bz2.md5
 fi
 

diff --git a/distdir/post-process-dist b/distdir/post-process-dist
new file mode 100644 (file)
index 0000000..f6e4f38
--- /dev/null
+++ b/distdir/post-process-dist
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+distribution=$1
+dist_version=$2
+package=$3
+distdir=$4
+
+# Remove all CVS directories, as some may be left when we put directories
+# in EXTRA_DIST or 'include' them in distribution.
+
+if test -d $distdir; then
+  rm -rf `find $distdir -name CVS`
+fi

diff --git a/distdir/server b/distdir/server
index f15e999d1a6c2722b8e8fdc2ed64f377599b8f96..97f82d34e955ca1e3a8674a994a36f4c22fe758a 100644 (file)
--- a/distdir/server
+++ b/distdir/server
@@ -1,7 +1,10 @@
 name Server
 package silc-server
 bug-report silc-devel@lists.silcnet.org
+
 inherit common
 define SILC_DIST_SERVER
 undef SILC_DIST_SFTP
+
+post-process-dist-hook distdir/post-process-dist
 post-dist-hook distdir/post-dist

diff --git a/distdir/toolkit b/distdir/toolkit
index fb678dd722122ad2a790f3bbbda62ab050c7f377..de5af055a80a802e9e51450a4cc02cb313d71444 100644 (file)
--- a/distdir/toolkit
+++ b/distdir/toolkit
@@ -1,14 +1,18 @@
 name Toolkit
 package silc-toolkit
 bug-report silc-devel@lists.silcnet.org
+
 inherit common
 inherit client
 inherit server
 define SILC_DIST_TOOLKIT
+
 include README.CVS
 include README.WIN32
 include README.MACOSX
 include silcer
 include tutorial
+
 pre-hook distdir/pre-run
+post-process-dist-hook distdir/post-process-dist
 post-dist-hook distdir/post-dist

diff --git a/doc/Makefile.ad b/doc/Makefile.ad
index f6c1b5f3377c8d90c3a067c668e7874d0b1f6c33..85e313cdde1887192466bfb01c1a91c24951cc23 100644 (file)
--- a/doc/Makefile.ad
+++ b/doc/Makefile.ad
@@ -74,7 +74,6 @@ dist-hook:
 
 #else !SILC_DIST_TOOLKIT
 dist-hook:
-       rm -rf `find $(top_distdir)/doc -name CVS`
        $(SILC_TOP_SRCDIR)/scripts/manpages.pl
        rm draft-riikonen*.txt
        touch draft-riikonen-silc-spec-08.txt

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index daa391379e7a6e066213ad5e9d2224fb9d57e1f6..c662a01b2e17cf696eaa124b0e85c3c54c533d48 100644 (file)
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -108,6 +108,6 @@ libsilcclient.a:
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = silc.pc silcclient.pc
 
-EXTRA_DIST = doc silc.pc.in silcclient.pc.in
+EXTRA_DIST = silc.pc.in silcclient.pc.in
 #endif SILC_DIST_TOOLKIT