summary refs log tree commit diff stats
path: root/plugins
diff options
context:
space:
mode:
authorbviktor <berkeviktor@aol.com>2012-07-14 10:24:35 -0700
committerbviktor <berkeviktor@aol.com>2012-07-14 10:24:35 -0700
commit5749eee43c02216df576edc6d26c8803bb6e020b (patch)
tree1dc5962d1685b66ff2f574b9c2903ee1e63f7008 /plugins
parent91ac20c0768c5cac18bd5c7afcaebb0b5a61f0de (diff)
parent8d643d376f422190c9c7e674cdd0de79c205c503 (diff)
Merge pull request #2 from TingPing/master
Update scripting interfaces to use correct libdir
Diffstat (limited to 'plugins')
-rw-r--r--plugins/perl/Makefile.am2
-rw-r--r--plugins/plugin-conf.in5
-rw-r--r--plugins/python/Makefile.am2
-rw-r--r--plugins/tcl/Makefile.am2
4 files changed, 5 insertions, 6 deletions
diff --git a/plugins/perl/Makefile.am b/plugins/perl/Makefile.am
index 816ae67c..eefb785b 100644
--- a/plugins/perl/Makefile.am
+++ b/plugins/perl/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST=alt_completion.pl xchat2-perldocs.html xchat2-perl.html \
 	lib/Xchat/List/Network/Entry.pm lib/Xchat/List/Network/AutoJoin.pm \
 	lib/IRC.pm
 
-libdir = $(xchatlibdir)/plugins
+libdir = $(hexchatlibdir)/plugins
 
 lib_LTLIBRARIES = perl.la
 perl_la_SOURCES = perl.c
diff --git a/plugins/plugin-conf.in b/plugins/plugin-conf.in
index d05792b1..1e2c338e 100644
--- a/plugins/plugin-conf.in
+++ b/plugins/plugin-conf.in
@@ -1,4 +1,3 @@
-
 AC_INIT(@PLUGIN@-config.h.in)
 AM_CONFIG_HEADER(@PLUGIN@-config.h)
 AM_INIT_AUTOMAKE(xchat-@PLUGIN@, @PLUGIN_VERSION@)
@@ -12,8 +11,8 @@ AC_ARG_WITH(plugin-includes,
 
 AC_SUBST(PLUGIN_INCLUDES)
 
-xchatlibdir=${libdir}/xchat
-AC_SUBST(xchatlibdir)
+hexchatlibdir=${libdir}/hexchat
+AC_SUBST(hexchatlibdir)
 
 AC_OUTPUT(
 Makefile
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index 1e4adff8..89d5f15f 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = 
 
-libdir = $(xchatlibdir)/plugins
+libdir = $(hexchatlibdir)/plugins
 
 lib_LTLIBRARIES = python.la
 python_la_SOURCES = python.c
diff --git a/plugins/tcl/Makefile.am b/plugins/tcl/Makefile.am
index 804fc83b..da2eb74b 100644
--- a/plugins/tcl/Makefile.am
+++ b/plugins/tcl/Makefile.am
@@ -1,7 +1,7 @@
 
 EXTRA_DIST=printevents.h tclplugin.h README
 
-libdir = $(xchatlibdir)/plugins
+libdir = $(hexchatlibdir)/plugins
 
 lib_LTLIBRARIES = tcl.la
 tcl_la_SOURCES = tclplugin.c