Fri Jan 6 13:08:15 CET 2006 Jochen Eisinger <coffee@silcnet.org>

	* Fixed more autodist issues.  Affected file doc/Makefile.ad,
	  apps/irssi/src/perl/Makefile.am, distdir/post-process-dist.

diff --git a/CHANGES b/CHANGES
index 862cb32f89f431e46e27497f140b08093687511f..19177fa1ed6507ebcc2025b6b0da6ee28373d7ac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Fri Jan  6 13:08:15 CET 2006 Jochen Eisinger <coffee@silcnet.org>
+
+       * Fixed more autodist issues.  Affected file doc/Makefile.ad,
+         apps/irssi/src/perl/Makefile.am, distdir/post-process-dist.
+
 Thu Jan  5 20:02:31 CET 2006 Patrik Weiskircher <pat@icore.at>
 
        * make sure session->hostname and session->port are valid before the
@@ -7,6 +12,7 @@ Thu Jan  5 20:02:31 CET 2006 Patrik Weiskircher <pat@icore.at>
          Patch received from Stefan Siegel <stesie@brokenpipe.de>, thanks!
 
 Wed Dec 14 19:21:42 CET 2005 Jochen Eisinger <coffee@silcnet.org> 
+
        * Fixed autodist configuration for silc-client.  Affected file
          configure.ad
        * Honor user set hostname.  Also give the user a chance to

diff --git a/apps/irssi/src/perl/Makefile.am b/apps/irssi/src/perl/Makefile.am
index ac8fa7e7f47d22d900d1e045216e28e4fcb8f08a..b2f2071ef9a6e9fd54bd346c4c2f9704d0653456 100644 (file)
--- a/apps/irssi/src/perl/Makefile.am
+++ b/apps/irssi/src/perl/Makefile.am
@@ -157,7 +157,7 @@ clean-generic:
 distclean-generic:
        for dir in $(perl_dirs); do \
          cd $$dir && \
-         $(MAKE) realclean && rm -f Makefile.PL && \
+         test ! -f Makefile || $(MAKE) realclean && rm -f Makefile.PL && \
          cd ..; \
        done
 

diff --git a/distdir/post-process-dist b/distdir/post-process-dist
index 375b98633b57e5e0149ebcd72abcb216f18f3da6..5fc77eaeb415d2a049b45a1f7f24ff4902a826ed 100644 (file)
--- a/distdir/post-process-dist
+++ b/distdir/post-process-dist
@@ -9,6 +9,6 @@ distdir=$4
 # in EXTRA_DIST or 'include' them in distribution.
 
 if test -d $distdir; then
-  rm -rf `find $distdir -name CVS`
-  rm -rf `find $distdir -name Makefile`
+  find $distdir -name CVS -type d | xargs rm -rf
+  find $distdir -name Makefile -type f | xargs rm -f
 fi

diff --git a/doc/Makefile.ad b/doc/Makefile.ad
index ef1c040baa1c1683e0e12d0150e950012eff51fd..db0c4720a1ebb006583a6d688025d469ae56ec93 100644 (file)
--- a/doc/Makefile.ad
+++ b/doc/Makefile.ad
@@ -87,6 +87,8 @@ doc-install:
        -mkdir -p $(docdir)
 #ifdef SILC_DIST_TOOLKIT
        -$(INSTALL_DATA) $(top_srcdir)/doc/CodingStyle $(docdir)/
+       -$(INSTALL_DATA) $(top_srcdir)/GPL $(docdir)/
+       -$(INSTALL_DATA) $(top_srcdir)/BSD $(docdir)/
 #endif SILC_DIST_TOOLKIT
        -$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/
        -$(INSTALL_DATA) $(top_srcdir)/doc/*.txt $(docdir)/
@@ -104,6 +106,9 @@ EXTRA_DIST =                        \
 #ifdef SILC_DIST_CLIENT
        silc.1                  \
 #endif SILC_DIST_CLIENT
+#ifndef SILC_DIST_CLIENT
+       example_silcd.conf      \
+#endif
 #ifdef SILC_DIST_SERVER
        examples silcd.8 silcd.conf.5   \
 #endif SILC_DIST_SERVER
@@ -112,7 +117,6 @@ EXTRA_DIST =                        \
        CodingStyle             \
 #endif SILC_DIST_TOOLKIT
        FAQ                     \
-       example_silcd.conf      \
        silcalgs.conf           \
        draft-riikonen*.txt