Applied Ville Räsänen's --mandir bugfix patch. Bug #88.

diff --git a/CHANGES b/CHANGES
index d0f0c0295e1f880b8d3a214f8153dd061f3f6ed2..04711b053fb963a5a13f9e88e8baeca6e283bf1e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,10 @@ Sun Nov 24 18:26:42 EET 2002  Pekka Riikonen <priikone@silcnet.org>
          notifys in Irssi SILC Client.  Affected file is
          irssi/src/silc/core/client_ops.c.  Bug #82.
 
+       * Applied Ville Räsänen's manual page and --mandir bugfix
+         patch.  Affected files are configure.in.pre and Makefile.am.pre.
+         Bug #88.
+
 Fri Nov 22 18:34:20 EET 2002  Pekka Riikonen <priikone@silcnet.org>
 
        * Added support to backup router protocol for backup to tell

diff --git a/Makefile.am.pre b/Makefile.am.pre
index acd6cf6389b7890cea5c4d80c9cf7873300c333f..522f7f2c910d6c9e3416ec2878b47ec9246ee954 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -44,7 +44,6 @@ modulesdir = $(DESTDIR)$(silc_modulesdir)
 helpdir = $(DESTDIR)$(silc_helpdir)
 docdir = $(DESTDIR)$(silc_docdir)
 logsdir = $(DESTDIR)$(silc_logsdir)
-manualdir = $(DESTDIR)$(silc_mandir)
 
 install-dirs:
        -mkdir -p $(etcdir)
@@ -53,12 +52,12 @@ install-dirs:
 
 install-dirs-client: install-dirs
        -mkdir -p $(helpdir)
-       -mkdir -p $(manualdir)/man1
+       -mkdir -p $(mandir)/man1
 
 install-dirs-server: install-dirs
        -mkdir -p $(logsdir)
-       -mkdir -p $(manualdir)/man5
-       -mkdir -p $(manualdir)/man8
+       -mkdir -p $(mandir)/man5
+       -mkdir -p $(mandir)/man8
 
 doc-install:
        -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
@@ -74,16 +73,16 @@ doc-install:
 doc-install-client: doc-install
        $(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf
        -@if test -f $(srcdir)/doc/silc.1 ; then \
-        $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(manualdir)/man1; \
+        $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
        fi
 
 doc-install-server: doc-install
        -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
        -@if test -f $(srcdir)/doc/silcd.8 ; then \
-        $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(manualdir)/man8; \
+        $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
        fi
        -@if test -f $(srcdir)/doc/silcd.conf.5 ; then \
-        $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(manualdir)/man5; \
+        $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(mandir)/man5; \
        fi
 
 etc-install-client:

diff --git a/configure.in.pre b/configure.in.pre
index 0e37c1a45cf73d6a365d10ac82f91e73dd74709b..56728edaf5ea95da9fef1a9524aa927442914e9b 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -387,23 +387,6 @@ 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|yes)
-        ;;
-      *)
-        MANDIR="$withval"
-        ;;
-    esac
-  ])
-AC_SUBST(MANDIR)
-AC_DEFINE_UNQUOTED(SILC_MANDIR, "$MANDIR")
-
 # silcd config file checking
 #
 summary_silcd_configfile="/etc/silc/silcd.conf"
@@ -1065,6 +1048,7 @@ 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 ""
@@ -1080,7 +1064,7 @@ echo ""
 echo " Installation prefix ...........: $prefix"
 echo " bin directory .................: $s_bindir"
 echo " sbin directory ................: $s_sbindir"
-echo " man directory .................: $MANDIR"
+echo " man directory .................: $s_mandir"
 echo " help directory ................: $HELPDIR"
 echo " doc directory .................: $DOCDIR"
 echo " logs directory ................: $LOGSDIR"