From a269facd39abf946a497929aee320caafcdf760d Mon Sep 17 00:00:00 2001
From: Jochen Eisinger <coffee@silcnet.org>
Date: Sun, 13 May 2007 20:09:27 +0000
Subject: [PATCH] Sun May 13 22:08:59 CEST 2007  Jochen Eisinger
 <coffee@silcnet.org>

	* Adopt perl Makefiles for SILC Plugin.
---
 CHANGES                         | 11 +++++++++++
 apps/irssi/Makefile.am          | 12 ++++++++----
 apps/irssi/src/perl/Makefile.am |  9 ++++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5ddf1fde..d747d874 100644
--- 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 0233e8e1..9c5f102e 100644
--- 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 3b978476..46502980 100644
--- 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)
-- 
2.24.0