remove changelog entry for undone update

[silc.git] / Makefile.defines_int.in

diff --git a/Makefile.defines_int.in b/Makefile.defines_int.in
index 4c7f41450b428724a09584e8f56e35d597e2b305..817ec5fec0e8990c7f298f01f3152ca6811fe5aa 100644 (file)
--- a/Makefile.defines_int.in
+++ b/Makefile.defines_int.in
@@ -1,14 +1,13 @@
 #
 #  Makefile.defines_int.pre
 #
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2001 Pekka Riikonen
+#  Copyright (C) 2000 - 2005 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
@@ -30,13 +29,18 @@ silc_install_prefix=@prefix@
 #
 # Common libraries that are linked against the created executable
 #
-SILC_COMMON_LIBS= @LIBS@ -L$(silc_top_srcdir)/lib -lsilc
+SILC_COMMON_LIBS= -L$(silc_top_srcdir)/lib -lsilc @LIBS@
 
 #
 # Common compilation flags
 #
 SILC_CFLAGS=@CFLAGS@
 
+#
+# SILC Library includes
+#
+SILC_LIB_INCLUDES=@SILC_LIB_INCLUDES@
+
 #
 # Installation defines
 #
@@ -45,3 +49,9 @@ silc_modulesdir=@MODULESDIR@
 silc_helpdir=@HELPDIR@
 silc_docdir=@DOCDIR@
 silc_logsdir=@LOGSDIR@
+etcdir = $(DESTDIR)$(silc_etcdir)
+modulesdir = $(DESTDIR)$(silc_modulesdir)
+helpdir = $(DESTDIR)$(silc_helpdir)
+docdir = $(DESTDIR)$(silc_docdir)
+logsdir = $(DESTDIR)$(silc_logsdir)
+mandir = $(DESTDIR)@mandir@