Merged silc_1_0_branch to trunk.

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index acd6cf6389b7890cea5c4d80c9cf7873300c333f..2c1eae371f80b3ea10812edaba96cadf677785f6 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2002Pekka Riikonen
+#  Copyright (C) 2000 - 2003 Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ dist-bzip: distdir
        -rm -rf $(distdir)
 
 SILC_EXTRA_DIST = SILC_DISTRIBUTION_EXTRA
-EXTRA_DIST = CHANGES CREDITS $(SILC_EXTRA_DIST)
+EXTRA_DIST = libtoolfix CHANGES CREDITS $(SILC_EXTRA_DIST)
 
 #
 # Installing of SILC into the system
@@ -44,7 +44,7 @@ modulesdir = $(DESTDIR)$(silc_modulesdir)
 helpdir = $(DESTDIR)$(silc_helpdir)
 docdir = $(DESTDIR)$(silc_docdir)
 logsdir = $(DESTDIR)$(silc_logsdir)
-manualdir = $(DESTDIR)$(silc_mandir)
+mandir = $(DESTDIR)@mandir@
 
 install-dirs:
        -mkdir -p $(etcdir)
@@ -53,12 +53,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 +74,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:
@@ -126,7 +126,7 @@ if SILC_DIST_CLIENT
 install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
 else
 if SILC_DIST_TOOLKIT
-install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server generate-server-key
+install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server
 else
 install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
 endif