Integer type name change.

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 5be670a0961cf6578eb4c20b529ff70c20b87211..3d5f545608480c2b503384c77b282a8625044b6e 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -1,14 +1,13 @@
 #
 #  Makefile.am
 #
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#  Author: Pekka Riikonen <priikone@silcnet.org>
 #
 #  Copyright (C) 2000 - 2001 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
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+#  the Free Software Foundation; version 2 of the License.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -37,11 +36,11 @@ EXTRA_DIST = CHANGES CREDITS $(SILC_EXTRA_DIST)
 # Installing of SILC into the system
 #
 
-etcdir = $(silc_etcdir)
-modulesdir = $(silc_modulesdir)
-helpdir = $(silc_helpdir)
-docdir = $(silc_docdir)
-logsdir = $(silc_logsdir)
+etcdir = $(DESTDIR)$(silc_etcdir)
+modulesdir = $(DESTDIR)$(silc_modulesdir)
+helpdir = $(DESTDIR)$(silc_helpdir)
+docdir = $(DESTDIR)$(silc_docdir)
+logsdir = $(DESTDIR)$(silc_logsdir)
 
 install-dirs:
        -mkdir -p $(etcdir)
@@ -56,7 +55,7 @@ generate-server-key:
        fi
 
 sim-install:
-       -cp -fR $(srcdir)/lib/silcsim/modules/*.so $(modulesdir)/
+       -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
 
 doc-install:
        $(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
@@ -70,15 +69,36 @@ doc-install:
        $(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
        $(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
 
+toolkit-install:
+       -mkdir -p $(docdir)/toolkit/
+       -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
+       -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit
+
+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/cell* $(docdir)/examples/
+
 etc-install:
        -@if test '!' -f $(etcdir)/silcd.conf ; then \
          $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
-         $(etcdir)/silcd.conf; \
+               $(etcdir)/silcd.conf; \
+         $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
+               $(etcdir)/silcalgs.conf; \
           chmod go= $(etcdir)/silcd.conf; \
        fi
        -@if test '!' -f $(etcdir)/silc.conf ; then \
-         $(INSTALL_DATA) $(srcdir)/doc/example_silc.conf \
+         $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
          $(etcdir)/silc.conf; \
        fi
 
-install-data-hook: install-dirs generate-server-key sim-install doc-install etc-install
+if SILC_DIST_CLIENT
+install-data-hook: install-dirs sim-install doc-install etc-install
+else
+if SILC_DIST_TOOLKIT
+install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install
+else
+install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
+endif
+endif