projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_1_branch to trunk.
[silc.git]
/
apps
/
irssi
/
src
/
perl
/
Makefile.am
diff --git
a/apps/irssi/src/perl/Makefile.am
b/apps/irssi/src/perl/Makefile.am
index 3b978476929d241fe4b62b83ce54430d76cc7dc3..43a6a341ad6813834aba498830cf0d0bab067f44 100644
(file)
--- a/
apps/irssi/src/perl/Makefile.am
+++ b/
apps/irssi/src/perl/Makefile.am
@@
-2,9
+2,16
@@
LIBTOOL = $(PERL_LIBTOOL)
include $(top_srcdir)/Makefile.defines.in
include $(top_srcdir)/Makefile.defines.in
-moduledir =
$(silc_modulesdir)
+moduledir =
@SILC_IRSSIDIR@
+if SILCPLUGIN
+perl_dirs = silc
+SCRIPTDIR="$(datadir)/irssi/scripts"
+else
perl_dirs = common ui textui silc
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)
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) \
-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)
-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
$(PERL_CFLAGS)