Merge commit 'origin/silc.1.1.branch'

[silc.git] / Makefile.defines_int.in

diff --git a/Makefile.defines_int.in b/Makefile.defines_int.in
index 3f82947145d85da14cd1cd305ef08bcceb3850f3..8d639153c575d373b8e57a9bed8c4e411996137f 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 - 2007 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,7 +29,8 @@ 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_LDFLAGS= @LDFLAGS@
+SILC_COMMON_LIBS= -lsilc @LIBS@
 
 #
 # Common compilation flags
@@ -49,10 +49,12 @@ silc_etcdir=@ETCDIR@
 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@
+#ifdef SILC_DIST_SERVER
+silc_logsdir=@LOGSDIR@
+logsdir = $(DESTDIR)$(silc_logsdir)
+#endif SILC_DIST_SERVER
\ No newline at end of file