rhythmbox r5564 - in trunk: . podcast

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Feb  5 12:04:57 2008
New Revision: 5564
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5564&view=rev

Log:
2008-02-05  Jonathan Matthew  <jonathan d14n org>

	patch by:  Damien Carbery  <damien carbery sun com>

	* configure.ac:
	* podcast/Makefile.am:
	Allow the browser plugin install directory to be specified using the
	MOZILLA_PLUGINDIR environment variable.  Fixes #508499.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/podcast/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb  5 12:04:57 2008
@@ -1016,6 +1016,8 @@
 		[glib-2.0 $gecko-plugin],
 		[],[enable_browser_plugins=no])
 fi
+MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:="\${libdir}/mozilla/plugins"}"
+AC_ARG_VAR([MOZILLA_PLUGINDIR],[Where to install the browser plugin to])
 
 AM_CONDITIONAL([ENABLE_BROWSER_PLUGIN], test x$enable_browser_plugin = xyes)
 

Modified: trunk/podcast/Makefile.am
==============================================================================
--- trunk/podcast/Makefile.am	(original)
+++ trunk/podcast/Makefile.am	Tue Feb  5 12:04:57 2008
@@ -46,7 +46,7 @@
 librbpodcast_la_LDFLAGS = -export-dynamic
 
 if ENABLE_BROWSER_PLUGIN
-plugindir = ${libdir}/mozilla/plugins
+plugindir = $(MOZILLA_PLUGINDIR)
 plugin_LTLIBRARIES = librhythmbox-itms-detection-plugin.la
 librhythmbox_itms_detection_plugin_la_SOURCES = rhythmbox-itms-plugin.cpp
 librhythmbox_itms_detection_plugin_la_CXXFLAGS = $(BROWSER_PLUGIN_CFLAGS)