updates.

diff --git a/README.DIST b/README.DIST
index cfd1d98f92404ab9f5ceb4b916c0972860b6125e..5031e099cffa9620d1670dcca6ff662a9be91c1f 100644 (file)
--- a/README.DIST
+++ b/README.DIST
@@ -19,59 +19,65 @@ give command:
 
        autodist <name> <version>
 
-Where the <name> is the distribution name.  It is one of the distributions 
-that was defined in distdir/ directory.  The <version> is the version of 
-the distribution that will be prepared.  The version format is 
+Where the <name> is the distribution name.  It is one of the distributions
+that was defined in distdir/ directory.  The <version> is the version of
+the distribution that will be prepared.  The version format is
 major.minor.build, for example 0.9.10.  Example:
 
        autodist client 0.9.15
 
-This prepares 'client' distribution of version 0.9.15.  The package will 
+This prepares 'client' distribution of version 0.9.15.  The package will
 have the version 0.9.15 automatically.
 
-NOTE: Those distribution that have RPM spec files you should specify the 
+NOTE: Those distribution that have RPM spec files you should specify the
 RPM release version to autodist also by doing the following:
 
        autodist toolkit 1.1.2 0.fc7
 
-where the "0.fc7" will become the RPM release version.  If you omit the 
+where the "0.fc7" will become the RPM release version.  If you omit the
 release version the default currently is "0.fc7".
 
 
 Configuring and compiling the distribution
 ==========================================
 
-When you prepare the distribution for releasing you should configure the 
-distribution without any specific configuration options, hence just give 
+When you prepare the distribution for releasing you should configure the
+distribution without any specific configuration options, hence just give
 the command:
 
        ./configure
 
+NOTE:  If you have SILC Toolkit installed to your system you must use
+the following command to configure the distribution, so that the Toolkit
+from the system is not used:
+
+       PKG_CONFIG=. ./configure
+
 To compile the distribution, give command:
 
        make
 
-If you want you can clear the environment first with make clean command, 
+If you want you can clear the environment first with make clean command,
 but this is not necessary.
 
 
 Packaging the distribution
 ==========================
 
-After the distribution is prepared, configured and compiled it can be 
+After the distribution is prepared, configured and compiled it can be
 packaged with the following commands:
 
        make -C doc dist-hook
        makedist --bzip2
 
-The 'makedist --bzip2' creates the default 'tar.gz' and 'tar.bz2' 
+The 'makedist --bzip2' creates the default 'tar.gz' and 'tar.bz2'
 distribution.
 
-NOTE:  Before giving this command, make sure that you do not have any of 
+NOTE:  Before giving this command, make sure that you do not have any of
 the tests in the SILC source tree compiled.  If they are the binaries
-will be included in the distribution which is not allowed.  The tests are 
+will be included in the distribution which is not allowed.  The tests are
 always located in the tests/ directory, for example lib/silccore/tests/.
-The tests are not compiled by default, but if you compiled them by 
+The tests are not compiled by default, but if you compiled them by
 yourself make sure you make clean them before creating the distribution.
 
 NOTE:  Same thing must be assured for silcer/ and tutorial/ sub
@@ -79,8 +85,8 @@ directories.  Make sure they are not compiled and does not include any
 extra files.  If you haven't compiled them after the CVS checkout, they do
 not include any extra files.
 
-NOTE for 'toolkit' distribution:  Running ./configure for toolkit 
-distribution is not necessary.  Toolkit is packaged simply by giving 
+NOTE for 'toolkit' distribution:  Running ./configure for toolkit
+distribution is not necessary.  Toolkit is packaged simply by giving
 command:
 
        makedist
@@ -89,19 +95,19 @@ command:
 Before releasing the distribution
 =================================
 
-Before releasing the distribution the created distribution must be tagged 
-in the CVS so that it can be checkout at a later time, if needed.  The tag 
+Before releasing the distribution the created distribution must be tagged
+in the CVS so that it can be checkout at a later time, if needed.  The tag
 format is as follows:
 
        silc_<name>_<version>
 
-Where <name> is the distribution name and <version> is the version of the 
-distribution in following format: major_minor_build, for example 0_9_10.  
+Where <name> is the distribution name and <version> is the version of the
+distribution in following format: major_minor_build, for example 0_9_10.
 Example:
 
        silc_client_0_9_15
 
-To tag the distribution go to the root of the SILC CVS source tree and 
+To tag the distribution go to the root of the SILC CVS source tree and
 give, for example, command:
 
        cvs tag silc_client_0_9_15

diff --git a/apps/irssi/silc-client.spec.in b/apps/irssi/silc-client.spec.in
index c4c1afd1b64e7389874a8c490cf29c8d46fe4da9..41a481198c01502262e7e451fbe93c3b8833a96a 100644 (file)
--- a/apps/irssi/silc-client.spec.in
+++ b/apps/irssi/silc-client.spec.in
@@ -13,8 +13,7 @@ Requires: silc-toolkit >= 1.1
 %description
 SILC (Secure Internet Live Conferencing) is a protocol which provides
 secure conferencing services on the Internet over insecure channel.
-SILC Client is used to connect to SILC server and SILC network.  More
-information at http://silcnet.org/.
+SILC Client is used to connect to SILC server and SILC network.
 
 # Need this because the irssi's configure we run from silc-client
 # configure somehow installs some of the files to location where I don't
@@ -54,5 +53,5 @@ rm -rf $RPM_BUILD_ROOT
 %doc apps/irssi/docs/*.txt apps/irssi/docs/*.html
 
 %changelog
-* Sat Jun  2 2007 - Pekka Riikonen <priikone@silcnet.org>
+* Sun Jun  3 2007 - Pekka Riikonen <priikone@silcnet.org>
 - Initial version

diff --git a/doc/Makefile.ad b/doc/Makefile.ad
index 2c9855e41b5366431d85b6e717ed7f7a63ffd54a..71087c4b7ed5efb49fb3b2d22c18cbebe000cc97 100644 (file)
--- a/doc/Makefile.ad
+++ b/doc/Makefile.ad
@@ -17,6 +17,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+#ifdef SILC_DIST_TOOLKIT
 all:
        touch draft-riikonen-silc-spec-09.txt
        touch draft-riikonen-silc-pp-09.txt
@@ -26,7 +27,6 @@ all:
        touch draft-riikonen-silc-multimedia-session-00.txt
        touch draft-riikonen-presence-attrs-04.txt
 
-#ifdef SILC_DIST_TOOLKIT
 makerfc = $(SILC_TOP_SRCDIR)/scripts/makerfc
 
 toolkit-ref-html:
@@ -52,7 +52,6 @@ toolkit-ref-pdf:
         fi
 
 dist-hook:
-       $(SILC_TOP_SRCDIR)/scripts/manpages.pl
        touch draft-riikonen-silc-spec-09.txt
        touch draft-riikonen-silc-pp-09.txt
        touch draft-riikonen-silc-ke-auth-09.txt
@@ -78,14 +77,6 @@ dist-hook:
 #else !SILC_DIST_TOOLKIT
 dist-hook:
        $(SILC_TOP_SRCDIR)/scripts/manpages.pl
-       rm -f draft-riikonen*.txt
-       touch draft-riikonen-silc-spec-09.txt
-       touch draft-riikonen-silc-pp-09.txt
-       touch draft-riikonen-silc-ke-auth-09.txt
-       touch draft-riikonen-silc-commands-07.txt
-       touch draft-riikonen-silc-flags-payloads-04.txt
-       touch draft-riikonen-silc-multimedia-session-00.txt
-       touch draft-riikonen-presence-attrs-04.txt
 #endif SILC_DIST_TOOLKIT
 
 doc-install:
@@ -94,9 +85,9 @@ doc-install:
        -$(INSTALL_DATA) $(top_srcdir)/doc/CodingStyle $(docdir)/
        -$(INSTALL_DATA) $(top_srcdir)/GPL $(docdir)/
        -$(INSTALL_DATA) $(top_srcdir)/BSD $(docdir)/
+       -$(INSTALL_DATA) $(top_srcdir)/doc/*.txt $(docdir)/
 #endif SILC_DIST_TOOLKIT
        -$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/
-       -$(INSTALL_DATA) $(top_srcdir)/doc/*.txt $(docdir)/
        -$(INSTALL_DATA) $(top_srcdir)/COPYING $(docdir)/
        -$(INSTALL_DATA) $(top_srcdir)/CHANGES $(docdir)/
        -$(INSTALL_DATA) $(top_srcdir)/CREDITS $(docdir)/
@@ -114,13 +105,14 @@ EXTRA_DIST =                      \
 #ifdef SILC_DIST_SERVER
        examples silcd.8 silcd.conf.5   \
        example_silcd.conf      \
+       silcalgs.conf           \
 #endif SILC_DIST_SERVER
 #ifdef SILC_DIST_TOOLKIT
        toolkit                 \
        CodingStyle             \
-#endif SILC_DIST_TOOLKIT
-       FAQ                     \
-       silcalgs.conf           \
        draft-riikonen*.txt
+       silcalgs.conf           \
+#endif SILC_DIST_TOOLKIT
+       FAQ
 
 include $(top_srcdir)/Makefile.defines.in