From 025fc27fe998393c10f74e21be32f70f4626640d Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 6 Nov 2002 14:38:54 +0000 Subject: [PATCH] =?utf8?q?=09Manual=20pages=20installation=20fix=20patch?= =?utf8?q?=20by=20Ville=20R=E4s=E4nen.=20=09USERS=20help=20file=20fix=20pa?= =?utf8?q?tch=20by=20Ville=20R=E4s=E4nen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile.am.pre | 32 ++++++++++++++++---------------- Makefile.defines_int.pre | 1 + acconfig.h.pre | 1 + apps/irssi/docs/help/in/users.in | 4 ++-- configure.in.pre | 20 ++++++++++++++++++-- win32/silcdefs.h | 1 + 6 files changed, 39 insertions(+), 20 deletions(-) diff --git a/Makefile.am.pre b/Makefile.am.pre index d11d1eff..4b22a967 100644 --- 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 4c7f4145..6ad5f765 100644 --- 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 ca82e2c5..403ac23e 100644 --- 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 952a8825..71cf2db2 100644 --- 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 3940ce84..2766a7ce 100644 --- 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 fd58aefc..704383e1 100644 --- 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 */ -- 2.24.0