Manual pages installation fix patch by Ville Räsänen.

	USERS help file fix patch by Ville Räsänen.

diff --git a/Makefile.am.pre b/Makefile.am.pre
index d11d1eff596aac064560341bce7b2dd96f88a824..4b22a96795887fc8b57deb939052d8a75c004253 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -44,7 +44,7 @@ modulesdir = $(DESTDIR)$(silc_modulesdir)
 helpdir = $(DESTDIR)$(silc_helpdir)
 docdir = $(DESTDIR)$(silc_docdir)
 logsdir = $(DESTDIR)$(silc_logsdir)
-manualdir = $(DESTDIR)/man
+manualdir = $(DESTDIR)$(silc_mandir)
 
 install-dirs:
        -mkdir -p $(etcdir)
@@ -66,19 +66,19 @@ sim-install:
        -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
 
 doc-install:
-       $(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(manualdir)/man1
-       $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(manualdir)/man8
-       $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(manualdir)/man5
-       $(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/README* $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/silc.1 $(manualdir)/man1
+       -$(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(manualdir)/man8;
+       -$(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(manualdir)/man5;
+       -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/README* $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
 
 toolkit-install:
        -mkdir -p $(docdir)/toolkit/
@@ -88,8 +88,8 @@ toolkit-install:
 
 examples-install:
        -mkdir -p $(docdir)/examples/
-       $(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
-       $(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
+       -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
+       -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
 
 etc-install:
        -@if test '!' -f $(etcdir)/silcd.conf ; then \

diff --git a/Makefile.defines_int.pre b/Makefile.defines_int.pre
index 4c7f41450b428724a09584e8f56e35d597e2b305..6ad5f7658e1068ec9e609d78b72f4eead574f1cc 100644 (file)
--- a/Makefile.defines_int.pre
+++ b/Makefile.defines_int.pre
@@ -45,3 +45,4 @@ silc_modulesdir=@MODULESDIR@
 silc_helpdir=@HELPDIR@
 silc_docdir=@DOCDIR@
 silc_logsdir=@LOGSDIR@
+silc_mandir=@MANDIR@

diff --git a/acconfig.h.pre b/acconfig.h.pre
index ca82e2c58afa21b282d4e1cb8b54cfcff18916c1..403ac23e25dd27b2bc909f7d4d6b0f5c8538580b 100644 (file)
--- a/acconfig.h.pre
+++ b/acconfig.h.pre
@@ -31,6 +31,7 @@
 #undef SILC_DOCDIR
 #undef SILC_MODULESDIR
 #undef SILC_LOGSDIR
+#undef SILC_MANDIR
 
 /* SIM (SILC Module) support */
 #undef SILC_SIM

diff --git a/apps/irssi/docs/help/in/users.in b/apps/irssi/docs/help/in/users.in
index 952a8825fd60e64f9619ad25bcb281972182ddfa..71cf2db271d4e998557f85259ca8d90b01203a6a 100644 (file)
--- a/apps/irssi/docs/help/in/users.in
+++ b/apps/irssi/docs/help/in/users.in
@@ -1,8 +1,8 @@
 
 @SYNTAX:users@
 
-Shows users of the specified channel.  You must
-already be on the channel.
+Shows users of the specified channel. The channel must be either joined or it
+needs to be a public channel (without secret or private flags set).
 
 Alias WHO is by default USERS * command.
 

diff --git a/configure.in.pre b/configure.in.pre
index 3940ce84f71a843b0b464954d483f172961e58a9..2766a7ce4c8821acfba9b38969045fa41070f30f 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -386,6 +386,23 @@ AC_ARG_WITH(logsdir,
 AC_SUBST(LOGSDIR)
 AC_DEFINE_UNQUOTED(SILC_LOGSDIR, "$LOGSDIR")
 
+# Manual directory
+#
+MANDIR="$silc_prefix/man"
+AC_ARG_WITH(mandir,
+  [[  --with-mandir=DIR       directory for SILC manual pages [PREFIX/man]]],
+  [
+    case "$withval" in
+      no)
+        ;;
+      *)
+        MANDIR="$withval"
+        ;;
+    esac
+  ])
+AC_SUBST(MANDIR)
+AC_DEFINE_UNQUOTED(SILC_MANDIR, "$MANDIR")
+
 # silcd config file checking
 #
 summary_silcd_configfile="/etc/silc/silcd.conf"
@@ -1010,7 +1027,6 @@ AC_OUTPUT
 
 s_bindir=`eval echo $bindir`;s_bindir=`eval echo $s_bindir`
 s_sbindir=`eval echo $sbindir`;s_sbindir=`eval echo $s_sbindir`
-s_mandir=`eval echo $mandir`;s_mandir=`eval echo $s_mandir`
 s_includedir=`eval echo $includedir`;s_includedir=`eval echo $s_includedir`
 
 echo ""
@@ -1026,7 +1042,7 @@ echo ""
 echo " Installation prefix ...........: $prefix"
 echo " bin directory .................: $s_bindir"
 echo " sbin directory ................: $s_sbindir"
-echo " man directory .................: $s_mandir"
+echo " man directory .................: $MANDIR"
 echo " help directory ................: $HELPDIR"
 echo " doc directory .................: $DOCDIR"
 echo " logs directory ................: $LOGSDIR"

diff --git a/win32/silcdefs.h b/win32/silcdefs.h
index fd58aefc88cdbc6a11e0bf7cfd90cd7b98a658af..704383e134a35890fda7a79746f62f45f8b1ff24 100644 (file)
--- a/win32/silcdefs.h
+++ b/win32/silcdefs.h
@@ -49,6 +49,7 @@
 #define SILC_DOCDIR "doc"
 #define SILC_MODULESDIR "modules"
 #define SILC_LOGSDIR "logs"
+#define SILC_MANDIR "man"
 
 /* SIM (SILC Module) support */
 /* #undef SILC_SIM */