Merge branch 'master' of git.opendreambox.org:/git/enigma2

9 files changed, 9 insertions, 9 deletions

diff --git a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
index e5838781..ee18898d 100755
--- a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_cutlisteditor.xml
 
diff --git a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
index a6f0a439..1899cb71 100644..100755
--- a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_dvdburn.xml
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
index a5b8047e..12d13710 100755
--- a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_dvdplayer.xml
 
diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
index b04ba5a2..5766ff34 100755
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_graphmultiepg.xml
 
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
index 721d8fb0..84e01672 100755
--- a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_mediaplayer.xml
 
diff --git a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
index a83c4b48..e2aa0e3b 100644..100755
--- a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_mediascanner.xml
diff --git a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
index ba9c3bbd..87b59f43 100755
--- a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_pictureplayer.xml
 
diff --git a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
index d957e22b..34ccbeb7 100644..100755
--- a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_socketmmi.xml
diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
index ab8e5169..ecdcac8a 100644..100755
--- a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_tuxboxplugins.xml