Merged silc_1_0_branch to trunk.

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index e20a823ba1a666c4fa4d7d14d26135876147555d..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
@@ -44,6 +44,7 @@ modulesdir = $(DESTDIR)$(silc_modulesdir)
 helpdir = $(DESTDIR)$(silc_helpdir)
 docdir = $(DESTDIR)$(silc_docdir)
 logsdir = $(DESTDIR)$(silc_logsdir)
+mandir = $(DESTDIR)@mandir@
 
 install-dirs:
        -mkdir -p $(etcdir)
@@ -125,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