/pidgin/main: bbef15512b9f: Fix Pidgin/Finch plugin directory ve...
Tomasz Wasilczyk
twasilczyk at pidgin.im
Wed Apr 23 18:13:35 EDT 2014
Changeset: bbef15512b9f882fc4b8edfcdef04915efc214d4
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-04-24 00:13 +0200
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/bbef15512b9f
Description:
Fix Pidgin/Finch plugin directory versioning
diffstat:
configure.ac | 11 +++++++++--
finch/plugins/Makefile.am | 2 +-
libpurple/plugins/Makefile.am | 2 +-
libpurple/plugins/keyrings/Makefile.am | 2 +-
libpurple/plugins/mono/Makefile.am | 2 +-
libpurple/plugins/mono/api/Makefile.am | 2 +-
libpurple/plugins/mono/loader/Makefile.am | 2 +-
libpurple/plugins/perl/Makefile.am | 2 +-
libpurple/plugins/ssl/Makefile.am | 2 +-
libpurple/plugins/tcl/Makefile.am | 2 +-
pidgin/plugins/Makefile.am | 2 +-
pidgin/plugins/cap/Makefile.am | 2 +-
pidgin/plugins/crazychat/Makefile.am | 2 +-
pidgin/plugins/disco/Makefile.am | 2 +-
pidgin/plugins/gestures/Makefile.am | 2 +-
pidgin/plugins/gevolution/Makefile.am | 2 +-
pidgin/plugins/musicmessaging/Makefile.am | 2 +-
pidgin/plugins/perl/common/Makefile.PL.in | 2 +-
pidgin/plugins/ticker/Makefile.am | 2 +-
pidgin/plugins/win32/transparency/Makefile.am | 2 +-
pidgin/plugins/win32/winprefs/Makefile.am | 2 +-
21 files changed, 29 insertions(+), 22 deletions(-)
diffs (235 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -192,8 +192,8 @@ else
AS_AC_EXPAND(common_libdir, "$libdir")
purple_libdir="\"$common_libdir/purple-$PURPLE_MAJOR_VERSION\""
- pidgin_libdir="\"$common_libdir/pidgin\""
- finch_libdir="\"$common_libdir/finch\""
+ pidgin_libdir="\"$common_libdir/pidgin-$PURPLE_MAJOR_VERSION\""
+ finch_libdir="\"$common_libdir/finch-$PURPLE_MAJOR_VERSION\""
fi
AC_DEFINE_UNQUOTED([PURPLE_DATADIR], [$purple_datadir],
[datadir to use, may expand into a function call that returns const char *])
@@ -208,6 +208,13 @@ AC_DEFINE_UNQUOTED([PURPLE_SYSCONFDIR],
AC_DEFINE_UNQUOTED([PURPLE_LOCALEDIR], [$purple_localedir],
[localedir to use, may expand into a function call that returns const char *])
+PURPLE_PLUGINDIR="\$(libdir)/purple-$PURPLE_MAJOR_VERSION"
+AC_SUBST([PURPLE_PLUGINDIR])
+PIDGIN_PLUGINDIR="\$(libdir)/pidgin-$PURPLE_MAJOR_VERSION"
+AC_SUBST([PIDGIN_PLUGINDIR])
+FINCH_PLUGINDIR="\$(libdir)/finch-$PURPLE_MAJOR_VERSION"
+AC_SUBST([FINCH_PLUGINDIR])
+
dnl Checks for library functions.
AC_TYPE_SIGNAL
AC_FUNC_STRFTIME
diff --git a/finch/plugins/Makefile.am b/finch/plugins/Makefile.am
--- a/finch/plugins/Makefile.am
+++ b/finch/plugins/Makefile.am
@@ -15,7 +15,7 @@ plugin_LTLIBRARIES = \
gnttinyurl.la \
grouping.la
-plugindir = $(libdir)/finch
+plugindir = @FINCH_PLUGINDIR@
gntclipboard_la_SOURCES = gntclipboard.c
gntgf_la_SOURCES = gntgf.c
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS = \
$(TCL_DIR) \
keyrings
-plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+plugindir = @PURPLE_PLUGINDIR@
autoaccept_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
buddynote_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/libpurple/plugins/keyrings/Makefile.am b/libpurple/plugins/keyrings/Makefile.am
--- a/libpurple/plugins/keyrings/Makefile.am
+++ b/libpurple/plugins/keyrings/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = \
wincred.c
CLEANFILES =
-plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+plugindir = @PURPLE_PLUGINDIR@
internalkeyring_la_CFLAGS = $(AM_CPPFLAGS)
internalkeyring_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/libpurple/plugins/mono/Makefile.am b/libpurple/plugins/mono/Makefile.am
--- a/libpurple/plugins/mono/Makefile.am
+++ b/libpurple/plugins/mono/Makefile.am
@@ -5,7 +5,7 @@ mono_sources = GetBuddyBack.cs \
EXTRA_DIST = $(mono_sources)
-monodir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+monodir = @PURPLE_PLUGINDIR@
mono_SCRIPTS = MPlugin.dll GetBuddyBack.dll
mono_build_sources = $(addprefix $(srcdir)/, $(mono_sources))
diff --git a/libpurple/plugins/mono/api/Makefile.am b/libpurple/plugins/mono/api/Makefile.am
--- a/libpurple/plugins/mono/api/Makefile.am
+++ b/libpurple/plugins/mono/api/Makefile.am
@@ -1,4 +1,4 @@
-monodir=$(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+monodir=@PURPLE_PLUGINDIR@
mono_sources = \
BlistNode.cs \
diff --git a/libpurple/plugins/mono/loader/Makefile.am b/libpurple/plugins/mono/loader/Makefile.am
--- a/libpurple/plugins/mono/loader/Makefile.am
+++ b/libpurple/plugins/mono/loader/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+plugindir = @PURPLE_PLUGINDIR@
plugin_LTLIBRARIES = mono.la
diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+plugindir = @PURPLE_PLUGINDIR@
perl_dirs = common
diff --git a/libpurple/plugins/ssl/Makefile.am b/libpurple/plugins/ssl/Makefile.am
--- a/libpurple/plugins/ssl/Makefile.am
+++ b/libpurple/plugins/ssl/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
Makefile.mingw
-plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+plugindir = @PURPLE_PLUGINDIR@
ssl_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
ssl_gnutls_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/libpurple/plugins/tcl/Makefile.am b/libpurple/plugins/tcl/Makefile.am
--- a/libpurple/plugins/tcl/Makefile.am
+++ b/libpurple/plugins/tcl/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+plugindir = @PURPLE_PLUGINDIR@
tcl_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
--- a/pidgin/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -35,7 +35,7 @@ SUBDIRS += \
win32/transparency
endif
-plugindir = $(libdir)/pidgin
+plugindir = @PIDGIN_PLUGINDIR@
contact_priority_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
extplacement_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/cap/Makefile.am b/pidgin/plugins/cap/Makefile.am
--- a/pidgin/plugins/cap/Makefile.am
+++ b/pidgin/plugins/cap/Makefile.am
@@ -1,4 +1,4 @@
-capdir = $(libdir)/pidgin
+capdir = @PIDGIN_PLUGINDIR@
cap_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/crazychat/Makefile.am b/pidgin/plugins/crazychat/Makefile.am
--- a/pidgin/plugins/crazychat/Makefile.am
+++ b/pidgin/plugins/crazychat/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/pidgin
+plugindir = @PIDGIN_PLUGINDIR@
if ENABLE_DEBUG
DEBUG_CPPFLAGS = -g -pg
diff --git a/pidgin/plugins/disco/Makefile.am b/pidgin/plugins/disco/Makefile.am
--- a/pidgin/plugins/disco/Makefile.am
+++ b/pidgin/plugins/disco/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/pidgin
+plugindir = @PIDGIN_PLUGINDIR@
xmppdisco_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/gestures/Makefile.am b/pidgin/plugins/gestures/Makefile.am
--- a/pidgin/plugins/gestures/Makefile.am
+++ b/pidgin/plugins/gestures/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/pidgin
+plugindir = @PIDGIN_PLUGINDIR@
gestures_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/gevolution/Makefile.am b/pidgin/plugins/gevolution/Makefile.am
--- a/pidgin/plugins/gevolution/Makefile.am
+++ b/pidgin/plugins/gevolution/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/pidgin
+plugindir = @PIDGIN_PLUGINDIR@
gevolution_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/musicmessaging/Makefile.am b/pidgin/plugins/musicmessaging/Makefile.am
--- a/pidgin/plugins/musicmessaging/Makefile.am
+++ b/pidgin/plugins/musicmessaging/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
music.png
-musicmessagingdir = $(libdir)/pidgin
+musicmessagingdir = @PIDGIN_PLUGINDIR@
musicmessaging_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/perl/common/Makefile.PL.in b/pidgin/plugins/perl/common/Makefile.PL.in
--- a/pidgin/plugins/perl/common/Makefile.PL.in
+++ b/pidgin/plugins/perl/common/Makefile.PL.in
@@ -16,7 +16,7 @@ WriteMakefile(
# 'OPTIMIZE' => '-g', # For debugging.
'INSTALLDIRS' => 'vendor',
'INSTALL_BASE' => '$(prefix)',
- 'INSTALLVENDORARCH' => '$(libdir)/pidgin/perl',
+ 'INSTALLVENDORARCH' => '$(libdir)/pidgin-$(PURPLE_MAJOR_VERSION)/perl',
'INSTALLVENDORMAN3DIR' => '$(mandir)/man3',
'macro' => {
'prefix' => '@prefix@',
diff --git a/pidgin/plugins/ticker/Makefile.am b/pidgin/plugins/ticker/Makefile.am
--- a/pidgin/plugins/ticker/Makefile.am
+++ b/pidgin/plugins/ticker/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
Makefile.mingw
-plugindir = $(libdir)/pidgin
+plugindir = @PIDGIN_PLUGINDIR@
ticker_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/win32/transparency/Makefile.am b/pidgin/plugins/win32/transparency/Makefile.am
--- a/pidgin/plugins/win32/transparency/Makefile.am
+++ b/pidgin/plugins/win32/transparency/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/pidgin
+plugindir = @PIDGIN_PLUGINDIR@
plugin_LTLIBRARIES = win2ktrans.la
diff --git a/pidgin/plugins/win32/winprefs/Makefile.am b/pidgin/plugins/win32/winprefs/Makefile.am
--- a/pidgin/plugins/win32/winprefs/Makefile.am
+++ b/pidgin/plugins/win32/winprefs/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/pidgin
+plugindir = @PIDGIN_PLUGINDIR@
plugin_LTLIBRARIES = winprefs.la
More information about the Commits
mailing list