updates.

diff --git a/Makefile.am.pre b/Makefile.am.pre
index a13e2abfd5abda6148bda9102337ac7233b9caba..faeab16501b0d72ab9b87571c032e99fd2da4cd8 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 SUBDIRS = lib irssi silc silcd doc includes
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 
-include $(top_srcdir)/Makefile.defines
+include $(top_srcdir)/Makefile.defines.in
 
 dist-bzip: distdir
        -chmod -R a+r $(distdir)

diff --git a/Makefile.defines.pre b/Makefile.defines.pre
index bac184503781cb1fa8d9ea1e3a6e442e802be3ec..61644d1a3d0b1586484ed15c2ddf51fd41959fad 100644 (file)
--- a/Makefile.defines.pre
+++ b/Makefile.defines.pre
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 #
-#  Copyright (C) 2000 - 2001 Pekka Riikonen
+#  Copyright (C) 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
@@ -19,20 +19,22 @@
 #
 # This file is intended to include all common compilation defines for the
 # SILC source tree.  All Makefile.ams in the SILC source tree are expected
-# to include this file (Makefile.defines).  Also this file may be included
+# to include this file (Makefile.defines.in).  Also this file may be included
 # in any external project that is included in the SILC source tree.
 #
 # Add following to your Makefile.am:
 #
-# include $(top_srcdir)/Makefile.defines
+# include $(top_srcdir)/Makefile.defines.in
 #
-#
-# All packages in the SILC source tree that include the Makefile.defines
+# All packages in the SILC source tree that include the Makefile.defines.in
 # must also include the following two lines in their configure.in file.
 #
 # INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int"   
 # AC_SUBST(INCLUDE_DEFINES_INT)
 #
+# (See the Makefile.defines_int.pre for all different definitions but DO NOT
+#  directly include that file!)
+#
 
 @INCLUDE_DEFINES_INT@
 

diff --git a/Makefile.defines_int.pre b/Makefile.defines_int.pre
index c7fb38f89fe7f2292998f3b03cf0f3d5b162fbab..446ca8f9733d1e822e765a224f506f57e235033c 100644 (file)
--- a/Makefile.defines_int.pre
+++ b/Makefile.defines_int.pre
@@ -25,6 +25,7 @@
 # Generic definitions
 #
 silc_top_srcdir=@SILC_TOP_SRCDIR@
+silc_install_prefix=@prefix@
 
 #
 # Common libraries that are linked against the created executable
@@ -35,7 +36,7 @@ SILC_COMMON_LIBS= @LIBS@ -L$(silc_top_srcdir)/lib -lsilc
 # Installation defines
 #
 silc_etcdir=@ETCDIR@
-silc_modulesdir=$(prefix)/@MODULESDIR@
-silc_helpdir=$(prefix)/@HELPDIR@
-silc_docdir=$(prefix)/@DOCDIR@
-silc_logsdir=$(prefix)/@LOGSDIR@
+silc_modulesdir=$(silc_install_prefix)/@MODULESDIR@
+silc_helpdir=$(silc_install_prefix)/@HELPDIR@
+silc_docdir=$(silc_install_prefix)/@DOCDIR@
+silc_logsdir=$(silc_install_prefix)/@LOGSDIR@

diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am
index a8e1077dbc4a3741ce709be7f83f84ede70c8750..a8a1eff4a59bbf8e340cab5ba9030bb94e7d613d 100644 (file)
--- a/apps/irssi/Makefile.am
+++ b/apps/irssi/Makefile.am
@@ -8,7 +8,10 @@ default-theme.h: $(srcdir)/default.theme
 
 SUBDIRS = src docs
 
-confdir = $(sysconfdir)/irssi
+include $(top_srcdir)/Makefile.defines.in
+
+#confdir = $(sysconfdir)/irssi
+confdir = $(silc_etcdir)
 conf_DATA = config default.theme
 
 noinst_HEADERS = irssi-version.h

diff --git a/apps/irssi/docs/Makefile.am b/apps/irssi/docs/Makefile.am
index 80499614ff424e95004f6381f69a5656861aa14c..46dc1a1e125a145e443831ff67937cc7cb293762 100644 (file)
--- a/apps/irssi/docs/Makefile.am
+++ b/apps/irssi/docs/Makefile.am
@@ -1,4 +1,7 @@
-docdir = $(prefix)/doc/irssi
+include $(top_srcdir)/Makefile.defines.in
+
+#docdir = $(prefix)/doc/irssi
+docdir = $(silc_docdir)
 
 doc_DATA = \
        formats.txt \

diff --git a/apps/irssi/docs/help/Makefile.am.gen b/apps/irssi/docs/help/Makefile.am.gen
index abf824b4a25c9672e599913e4d969352ea20cf83..c836962bb38cc2dbdd2498c7e8dd34f2228d2f63 100644 (file)
--- a/apps/irssi/docs/help/Makefile.am.gen
+++ b/apps/irssi/docs/help/Makefile.am.gen
@@ -1,6 +1,8 @@
 # Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
 
-helpdir = $(datadir)/irssi/help
+include $(top_srcdir)/Makefile.defines.in
+
+helpdir = $(silc_helpdir)
 
 help_DATA = \
 @HELPFILES@

diff --git a/apps/irssi/src/core/Makefile.am b/apps/irssi/src/core/Makefile.am
index 1dc2f5f91ca4f5c66d3bed33dfe5d984b08f3a2d..1443bc91cc5a8186498e3aff04a8b425231c5dfc 100644 (file)
--- a/apps/irssi/src/core/Makefile.am
+++ b/apps/irssi/src/core/Makefile.am
@@ -1,9 +1,11 @@
 noinst_LIBRARIES = libcore.a
 
+include $(top_srcdir)/Makefile.defines.in
+
 INCLUDES = \
        $(GLIB_CFLAGS) \
-       -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DMODULEDIR=\""$(libdir)/irssi/modules"\" \
+       -DSYSCONFDIR=\""$(silc_etcdir)"\" \
+       -DMODULEDIR=\""$(silc_modulesdir)"\" \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/core
 

diff --git a/apps/irssi/src/fe-common/core/Makefile.am b/apps/irssi/src/fe-common/core/Makefile.am
index 9913cfe85f8beb7b90984fc0927943a1fdc46862..798c271c327cbce84b0e7cc1456651373618bd94 100644 (file)
--- a/apps/irssi/src/fe-common/core/Makefile.am
+++ b/apps/irssi/src/fe-common/core/Makefile.am
@@ -1,10 +1,12 @@
 noinst_LIBRARIES = libfe_common_core.a
 
+include $(top_srcdir)/Makefile.defines.in
+
 INCLUDES = \
        $(GLIB_CFLAGS) \
        -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
-       -DHELPDIR=\""$(datadir)/irssi/help"\" \
-       -DSYSCONFDIR=\""$(sysconfdir)"\"
+       -DHELPDIR=\""$(silc_helpdir)"\" \
+       -DSYSCONFDIR=\""$(silc_etcdir)"\"
 
 libfe_common_core_a_SOURCES = \
        autorun.c \

diff --git a/apps/irssi/src/fe-common/silc/Makefile.am b/apps/irssi/src/fe-common/silc/Makefile.am
index 320be8adbc4eda6937f09b4e3fe36213654591f4..72abc05ef880c6de8aaf73f42bba61c0d8802e64 100644 (file)
--- a/apps/irssi/src/fe-common/silc/Makefile.am
+++ b/apps/irssi/src/fe-common/silc/Makefile.am
@@ -1,11 +1,10 @@
-INCLUDES = $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src
-
-SILC_INCLUDE=../../../..
 IRSSI_INCLUDE=../../..
 
-INCLUDES = \
+include $(top_srcdir)/Makefile.defines.in
+
+ADD_INCLUDES = \
         $(GLIB_CFLAGS) \
-        -DSYSCONFDIR=\""$(sysconfdir)"\" \
+        -DSYSCONFDIR=\""$(silc_etcdir)"\" \
         -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \
         -I$(IRSSI_INCLUDE)/src/core \
         -I$(IRSSI_INCLUDE)/src/fe-common/core \

diff --git a/apps/irssi/src/fe-text/Makefile.am b/apps/irssi/src/fe-text/Makefile.am
index 2d6fe7c6bf7afae54fdc35f036d45ef1779711e9..326eb61801fe4555f379a983327b1ec6608c9c96 100644 (file)
--- a/apps/irssi/src/fe-text/Makefile.am
+++ b/apps/irssi/src/fe-text/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = silc
 
-include $(top_srcdir)/Makefile.defines
+include $(top_srcdir)/Makefile.defines.in
 
 ADD_INCLUDES = \
        $(GLIB_CFLAGS) \
@@ -14,13 +14,14 @@ ADD_INCLUDES = \
 
 silc_DEPENDENCIES = @COMMON_LIBS@
 
+LIBS = $(SILC_COMMON_LIBS)
 silc_LDADD = \
        @COMMON_LIBS@ \
        @PERL_LINK_LIBS@ \
        @PERL_FE_LINK_LIBS@ \
        $(PROG_LIBS) \
         $(CURSES_LIBS) \
-       -L../../../lib -lsilcclient $(SILC_COMMON_LIBS)
+       -L../../../lib -lsilcclient
 
 silc_SOURCES = \
         gui-entry.c \

diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am
index 259fb6ef375af1a905f74b94ec9268d0acb3660f..769899eed35dce696d227e24c344d7b6dfc203a6 100644 (file)
--- a/apps/irssi/src/silc/core/Makefile.am
+++ b/apps/irssi/src/silc/core/Makefile.am
@@ -1,10 +1,10 @@
-include $(top_srcdir)/Makefile.defines
+include $(top_srcdir)/Makefile.defines.in
 
 IRSSI_INCLUDE=../../..
 
 ADD_INCLUDES = \
        $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \
-        -DSYSCONFDIR=\""$(sysconfdir)"\" \
+        -DSYSCONFDIR=\""$(silc_etcdir)"\" \
         -I$(IRSSI_INCLUDE) \
        -I$(IRSSI_INCLUDE)/src \
         -I$(IRSSI_INCLUDE)/src/core \

diff --git a/apps/silc/Makefile.am b/apps/silc/Makefile.am
index 47bcd80d05c3f8f44074989543cff0dca76e4394..20217d08d0d0579e5a8500f62d6c59e1eb5d9b79 100644 (file)
--- a/apps/silc/Makefile.am
+++ b/apps/silc/Makefile.am
@@ -35,4 +35,4 @@ LDADD = -L. -L.. -L../lib -lsilcclient
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
+include $(top_srcdir)/Makefile.defines.in

diff --git a/apps/silcd/Makefile.am b/apps/silcd/Makefile.am
index c9b7e9884f2c82799da543a8073594a2b61a82f8..025895198baa436594bc141039be75045ece5109 100644 (file)
--- a/apps/silcd/Makefile.am
+++ b/apps/silcd/Makefile.am
@@ -40,4 +40,4 @@ LDADD =
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
+include $(top_srcdir)/Makefile.defines.in

diff --git a/configure.in.pre b/configure.in.pre
index 5b0524cea122dee201c01144c1d7ed7114147660..0b1b5ecef84036df9627a9d185a5cb15b5330f91 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -151,9 +151,10 @@ AC_ARG_WITH(etcdir,
   no)
     ;;
   yes)
+    ETCDIR="$withval"
     ;;
   *)
-    ETCDIR="$withwal"
+    ETCDIR="$withval"
     ;;
   esac ],
 )
@@ -167,9 +168,10 @@ AC_ARG_WITH(helpdir,
   no)
     ;;
   yes)
+    HELPDIR="$withval"
     ;;
   *)
-    HELPDIR="$withwal"
+    HELPDIR="$withval"
     ;;
   esac ],
 )
@@ -183,9 +185,10 @@ AC_ARG_WITH(docdir,
   no)
     ;;
   yes)
+    DOCDIR="$withval"
     ;;
   *)
-    DOCDIR="$withwal"
+    DOCDIR="$withval"
     ;;
   esac ],
 )
@@ -199,9 +202,10 @@ AC_ARG_WITH(simdir,
   no)
     ;;
   yes)
+    MODULESDIR="$withval"
     ;;
   *)
-    MODULESDIR="$withwal"
+    MODULESDIR="$withval"
     ;;
   esac ],
 )
@@ -215,9 +219,10 @@ AC_ARG_WITH(logsdir,
   no)
     ;;
   yes)
+    LOGSDIR="$withval"
     ;;
   *)
-    LOGSDIR="$withwal"
+    LOGSDIR="$withval"
     ;;
   esac ],
 )
@@ -395,6 +400,8 @@ AC_CONFIG_SUBDIRS(lib/trq)
 
 SILC_TOP_SRCDIR=`pwd`
 AC_SUBST(SILC_TOP_SRCDIR)
+#SILC_INSTALL_PREFIX=$ac_default_prefix
+#AC_SUBST(SILC_INSTALL_PREFIX)
 AC_SUBST(LIBS)
 INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int"
 AC_SUBST(INCLUDE_DEFINES_INT)

diff --git a/includes/version.h b/includes/version.h
index f5c4ca21e0936666c99494e8c238ae5c1b624b42..5c0654572ebf020ca54a6a91cee4d5731fd5987a 100644 (file)
--- a/includes/version.h
+++ b/includes/version.h
@@ -32,7 +32,7 @@ typedef unsigned char SilcVersion;
 /* SILC version string */
 const char *silc_version = SILC_VERSION_STRING;
 const char *silc_version_string = SILC_PROTOCOL_VERSION_STRING;
-const char *silc_name = "SILC";
+const char *silc_name = SILC_NAME;
 const char *silc_fullname = "Secure Internet Live Conferencing";
 
 #endif

diff --git a/lib/contrib/Makefile.am b/lib/contrib/Makefile.am
index 64305b1b618d192cab82074d20846d8d09be80f8..e5fcf4c40865eef075692832be4760f30feda2b0 100644 (file)
--- a/lib/contrib/Makefile.am
+++ b/lib/contrib/Makefile.am
@@ -27,4 +27,4 @@ libcontrib_a_SOURCES = \
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
+include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcclient/Makefile.am b/lib/silcclient/Makefile.am
index 208c92deefa73eff472db90cd8ca52db6c538889..b51424c6f8b45430d3ad14301cf9a6ffd33c8f83 100644 (file)
--- a/lib/silcclient/Makefile.am
+++ b/lib/silcclient/Makefile.am
@@ -33,5 +33,4 @@ libsilcclient_a_SOURCES = \
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
-
+include $(top_srcdir)/Makefile.defines.in
\ No newline at end of file

diff --git a/lib/silccore/Makefile.am b/lib/silccore/Makefile.am
index 41ffc31becba180c374b8c63fbb85433b955c96e..8eed24f851415ec0297c5e0a3ebd49c02154f27c 100644 (file)
--- a/lib/silccore/Makefile.am
+++ b/lib/silccore/Makefile.am
@@ -35,4 +35,4 @@ libsilccore_a_SOURCES = \
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
+include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silccrypt/Makefile.am b/lib/silccrypt/Makefile.am
index 8840a617bc4003703cb56b603f1627a9ab55ac32..57b8ecbd030ca32d262ec112475600db20be80d9 100644 (file)
--- a/lib/silccrypt/Makefile.am
+++ b/lib/silccrypt/Makefile.am
@@ -40,5 +40,4 @@ libsilccrypt_a_SOURCES = \
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
-
+include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcmath/Makefile.am b/lib/silcmath/Makefile.am
index 711bf79ae08251cee4b53dc14df8039c62419432..663a2ef8c7d899ee1207c72050b07e20cb90ed5a 100644 (file)
--- a/lib/silcmath/Makefile.am
+++ b/lib/silcmath/Makefile.am
@@ -33,5 +33,4 @@ libsilcmath_a_SOURCES = \
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
-
+include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index 4921e624d29beb47e17c1d0897079edd37d0e117..9f5dc781f54569ae0dfbdb7d49a4f2a5e953aff0 100644 (file)
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -76,5 +76,4 @@ CLEANFILES = $(SIM_MODULES_DIR)/*.sim.so
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
-
+include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcske/Makefile.am b/lib/silcske/Makefile.am
index b47e0be19746f6995585fa8e647e611d7f0ff2da..620f38dc892d848f67bb2b36152ed153a5ae426c 100644 (file)
--- a/lib/silcske/Makefile.am
+++ b/lib/silcske/Makefile.am
@@ -27,5 +27,4 @@ libsilcske_a_SOURCES = \
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
-
+include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcutil/Makefile.am b/lib/silcutil/Makefile.am
index f1040de51b1bf77e3f7e95c8da0011871447f2ec..79ac3e4f3ff318176ce15fa64c27e2897d920c5f 100644 (file)
--- a/lib/silcutil/Makefile.am
+++ b/lib/silcutil/Makefile.am
@@ -33,5 +33,4 @@ libsilcutil_a_SOURCES = \
 
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines
-
+include $(top_srcdir)/Makefile.defines.in

diff --git a/prepare b/prepare
index 6a0fe389e3b459d37b34ed7771ddde21c240426c..7073b1fbd670ea10b3c6bdd3f88f4dc7d68c1cb0 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -114,11 +114,11 @@ echo "/* Automatically generated by ./prepare */" >$file
 echo "#define SILC_VERSION_STRING \"$version\"" >>$file
 echo "#define SILC_DIST_VERSION_STRING \"$dist_version\"" >>$file
 echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.0-$version\"" >>$file
+echo "#define SILC_NAME \"SILC $distribution\"" >>$file
 
 # preparing irssi
 cd irssi
-#sh autogen.sh 2>/dev/null 1>/dev/null
-sh autogen.sh
+sh autogen.sh 2>/dev/null 1>/dev/null
 cd ..
 file=irssi/irssi-version.h.in
 version_date=`date +%Y%m%d`

diff --git a/prepare-clean b/prepare-clean
index f7ad79f8a170782884f8c9c0ba86805d2d97661e..d229699b3eb6ddda2c7b4bc00396d960e820aa39 100755 (executable)
--- a/prepare-clean
+++ b/prepare-clean
@@ -30,6 +30,7 @@ make distclean -k
 rm -f Makefile.am
 rm -f Makefile.defines
 rm -f Makefile.defines.in
+rm -f Makefile.defines_int
 rm -f Makefile.defines_int.in
 rm -f irssi/Makefile.defines
 rm -f irssi/Makefile.defines.in