From a19fc013a5fa16f878e2ae0cdeef8816addcd543 Mon Sep 17 00:00:00 2001 From: TingPing Date: Sat, 14 Jul 2012 02:22:24 -0500 Subject: [PATCH 1/2] fixed plugins using correct libdir --- plugins/perl/Makefile.am | 2 +- plugins/python/Makefile.am | 2 +- plugins/tcl/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 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/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 From 8d643d376f422190c9c7e674cdd0de79c205c503 Mon Sep 17 00:00:00 2001 From: TingPing Date: Sat, 14 Jul 2012 09:42:53 -0300 Subject: [PATCH 2/2] Update master --- plugins/plugin-conf.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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