From bd47eb32fc725a29596d389cd668e0582d5d538a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Mon, 3 Apr 2006 10:57:18 +0000
Subject: ext/swfdec/Makefile.am: Don't set plugindir.

Original commit message from CVS:
* ext/swfdec/Makefile.am:
Don't set plugindir.
* ext/swfdec/gstswfdec.c:
GST_PLUGIN_DEFINE_STATIC isn't a good idea for installed plugins.
---
 ChangeLog              | 8 ++++++++
 ext/swfdec/Makefile.am | 2 --
 ext/swfdec/gstswfdec.c | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f17e613..f48906c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-03  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/swfdec/Makefile.am:
+	  Don't set plugindir.
+
+	* ext/swfdec/gstswfdec.c:
+	  GST_PLUGIN_DEFINE_STATIC isn't a good idea for installed plugins.
+
 2006-04-03  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/ext/swfdec/Makefile.am b/ext/swfdec/Makefile.am
index d4e989f8..2d7f41d3 100644
--- a/ext/swfdec/Makefile.am
+++ b/ext/swfdec/Makefile.am
@@ -1,5 +1,3 @@
-plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
-
 plugin_LTLIBRARIES = libgstswfdec.la
 
 libgstswfdec_la_SOURCES = gstswfdec.c
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index dcd744ae..7f945e6b 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -908,7 +908,7 @@ plugin_init (GstPlugin * plugin)
       GST_TYPE_SWFDEC);
 }
 
-GST_PLUGIN_DEFINE_STATIC (GST_VERSION_MAJOR,
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "swfdec",
     "Uses libswfdec to decode Flash video streams",
-- 
cgit v1.2.1