plugin -> module

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@614 dbcabf3a-b0e7-0310-adc4-f8d773084564

8 files changed, 14 insertions, 15 deletions

diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
index 98846e33..3af1dc3e 100644
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(libdir)/irssi/plugins
-plugin_LTLIBRARIES = libfe_common_irc_dcc.la
+moduledir = $(libdir)/irssi/modules
+module_LTLIBRARIES = libfe_common_irc_dcc.la
 
 INCLUDES = \
 	$(GLIB_CFLAGS) \
diff --git a/src/fe-common/irc/flood/Makefile.am b/src/fe-common/irc/flood/Makefile.am
index eded09f6..83835386 100644
--- a/src/fe-common/irc/flood/Makefile.am
+++ b/src/fe-common/irc/flood/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(libdir)/irssi/plugins
-plugin_LTLIBRARIES = libfe_common_irc_flood.la
+moduledir = $(libdir)/irssi/modules
+module_LTLIBRARIES = libfe_common_irc_flood.la
 
 INCLUDES = \
 	$(GLIB_CFLAGS) \
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
index 30834273..e8f6d0fb 100644
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ b/src/fe-common/irc/notifylist/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(libdir)/irssi/plugins
-plugin_LTLIBRARIES = libfe_common_irc_notifylist.la
+moduledir = $(libdir)/irssi/modules
+module_LTLIBRARIES = libfe_common_irc_notifylist.la
 
 INCLUDES = \
 	$(GLIB_CFLAGS) \
diff --git a/src/irc/bot/Makefile.am b/src/irc/bot/Makefile.am
index e5daefc3..f2e83d1e 100644
--- a/src/irc/bot/Makefile.am
+++ b/src/irc/bot/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(libdir)/irssi/plugins
-plugin_LTLIBRARIES = libirc_bot.la
+moduledir = $(libdir)/irssi/modules
+module_LTLIBRARIES = libirc_bot.la
 
 INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
index 10ca695a..f810ba2c 100644
--- a/src/irc/dcc/Makefile.am
+++ b/src/irc/dcc/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(libdir)/irssi/plugins
-plugin_LTLIBRARIES = libirc_dcc.la
+moduledir = $(libdir)/irssi/modules
+module_LTLIBRARIES = libirc_dcc.la
 
 INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
index abab9e2b..aa686bdb 100644
--- a/src/irc/flood/Makefile.am
+++ b/src/irc/flood/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(libdir)/irssi/plugins
-plugin_LTLIBRARIES = libirc_flood.la
+moduledir = $(libdir)/irssi/modules
+module_LTLIBRARIES = libirc_flood.la
 
 INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
index 942314ec..7c6c19eb 100644
--- a/src/irc/notifylist/Makefile.am
+++ b/src/irc/notifylist/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(libdir)/irssi/plugins
-plugin_LTLIBRARIES = libirc_notifylist.la
+moduledir = $(libdir)/irssi/modules
+module_LTLIBRARIES = libirc_notifylist.la
 
 INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 9f9cc2f9..1a9a895b 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -3,7 +3,6 @@ noinst_LTLIBRARIES = libperl.la
 irssi-perl.c: perl-signals.h
 
 INCLUDES = $(GLIB_CFLAGS) \
-	-DPLUGINSDIR=\""$(libdir)/irssi/plugins"\" \
 	-DSCRIPTDIR=\""$(libdir)/irssi/scripts"\" \
 	$(PERL_CFLAGS) \
 	-I$(top_srcdir)/src \