Sun May 13 22:08:59 CEST 2007 Jochen Eisinger <coffee@silcnet.org>

	* Adopt perl Makefiles for SILC Plugin.

diff --git a/CHANGES b/CHANGES
index 5ddf1fde3d68cb10650775d5edf17afbd4ee7b9d..d747d8749c05cd4997bbfc18732919a7f1a874c6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,20 @@
+Sun May 13 22:08:59 CEST 2007  Jochen Eisinger <coffee@silcnet.org>
+
+       * Adopt perl Makefiles for SILC Plugin.
+
 Sun May 13 18:27:13 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed client library initialization when the running callback
          is not given to silc_client_init.  Affected file is
          lib/silcclient/client.c.
 
+       * Fixed Symbian compilation problems around the tree.  Added
+         new Carbide.c++ project files to symbian/ directory.
+
+       * Fixed SilcLog API to work on Symbian.  On Symbian it doesn't
+         use any globals.  Affected files are lib/silcutil/silclog.c
+         and silclog_i.h.
+
 Sun May 13 16:54:35 CEST 2007  Jochen Eisinger <coffee@silcnet.org>
 
        * Fix several warnings in Irssi's Makefiles.

diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am
index 0233e8e10daf73febfca48fec90a9943593c4cee..9c5f102e60875ebfd006872370139ffcb9b36139 100644 (file)
--- a/apps/irssi/Makefile.am
+++ b/apps/irssi/Makefile.am
@@ -21,7 +21,11 @@ include $(top_srcdir)/Makefile.defines.in
 confdir = $(silc_etcdir)
 conffile = silc.conf
 
+if SILCPLUGIN
+themedir = $(datadir)/irssi/themes
+else
 themedir = $(datadir)/silc/themes
+endif
 theme_DATA = default.theme
 
 noinst_HEADERS = irssi-version.h.in
@@ -58,7 +62,7 @@ doc-install-client:
 
 etc-install-client:
        -@if test -d $(silc_top_srcdir)/apps/irssi ; then \
-         -mkdir -p $(etcdir) \
+         mkdir -p $(etcdir) ; \
          if test '!' -f $(etcdir)/silc.conf ; then \
            $(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf \
                $(etcdir)/silc.conf; \
@@ -66,12 +70,12 @@ etc-install-client:
        fi
 
 if SILCPLUGIN
-ETCINSTALL=etc-install-client
-else
 ETCINSTALL=
+else
+ETCINSTALL=etc-install-client
 endif
 
 install-data-hook:             \
        install-dirs-client     \
        doc-install-client      \
-       etc-install-client
+       $(ETCINSTALL)

diff --git a/apps/irssi/src/perl/Makefile.am b/apps/irssi/src/perl/Makefile.am
index 3b978476929d241fe4b62b83ce54430d76cc7dc3..46502980cddb53b04ed58929be1584502696fb97 100644 (file)
--- a/apps/irssi/src/perl/Makefile.am
+++ b/apps/irssi/src/perl/Makefile.am
@@ -4,7 +4,14 @@ include $(top_srcdir)/Makefile.defines.in
 
 moduledir = $(silc_modulesdir)
 
+if SILCPLUGIN
+perl_dirs = silc
+SCRIPTDIR="$(datadir)/irssi/scripts"
+else
 perl_dirs = common ui textui silc
+SCRIPTDIR="$(datadir)/silc/scripts"
+endif
+
 
 module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib)
 noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib)
@@ -23,7 +30,7 @@ INCLUDES += \
        -I$(top_srcdir)/src/fe-common/core \
        -I$(top_srcdir)/src/fe-common/silc \
        $(GLIB_CFLAGS) \
-       -DSCRIPTDIR=\""$(datadir)/silc/scripts"\" \
+       -DSCRIPTDIR=\""$(SCRIPTDIR)"\" \
        -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
        -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
        $(PERL_CFLAGS)