From 40adbe1719b88eee1d7ee9c29c44d11e43be385e Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Fri, 6 Jan 2006 12:09:42 +0000 Subject: [PATCH] Fri Jan 6 13:08:15 CET 2006 Jochen Eisinger * Fixed more autodist issues. Affected file doc/Makefile.ad, apps/irssi/src/perl/Makefile.am, distdir/post-process-dist. --- CHANGES | 6 ++++++ apps/irssi/src/perl/Makefile.am | 2 +- distdir/post-process-dist | 4 ++-- doc/Makefile.ad | 6 +++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 862cb32f..19177fa1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +Fri Jan 6 13:08:15 CET 2006 Jochen Eisinger + + * 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 * 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 Patch received from Stefan Siegel , thanks! Wed Dec 14 19:21:42 CET 2005 Jochen Eisinger + * 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 ac8fa7e7..b2f2071e 100644 --- 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 375b9863..5fc77eae 100644 --- 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 ef1c040b..db0c4720 100644 --- 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 -- 2.24.0