enable metadata install, install into /usr/share/enigma2/meta/enigma2/

diff --git a/configure.ac b/configure.ac
index cba4cfa739961d96f5198d3b1326e699db70ca2b..8e8453a25a9167d7ea64522b7ecc9f775df2eb97 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -113,37 +113,60 @@ lib/python/Components/Renderer/Makefile
 lib/python/Components/Sources/Makefile
 lib/python/Screens/Makefile
 lib/python/Plugins/Makefile
-lib/python/Plugins/SystemPlugins/Makefile
-lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile
-lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile
-lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile
-lib/python/Plugins/SystemPlugins/Hotplug/Makefile
-lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile
-lib/python/Plugins/SystemPlugins/NFIFlash/Makefile
-lib/python/Plugins/SystemPlugins/Satfinder/Makefile
-lib/python/Plugins/SystemPlugins/SkinSelector/Makefile
-lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile
-lib/python/Plugins/SystemPlugins/Videomode/Makefile
-lib/python/Plugins/SystemPlugins/VideoTune/Makefile
-lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile
-lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile
-lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile
 lib/python/Plugins/DemoPlugins/Makefile
 lib/python/Plugins/DemoPlugins/TestPlugin/Makefile
-lib/python/Plugins/Extensions/Makefile
-lib/python/Plugins/Extensions/TuxboxPlugins/Makefile
 lib/python/Plugins/Extensions/CutListEditor/Makefile
-lib/python/Plugins/Extensions/MediaScanner/Makefile
-lib/python/Plugins/Extensions/MediaPlayer/Makefile
+lib/python/Plugins/Extensions/CutListEditor/meta/Makefile
 lib/python/Plugins/Extensions/DVDBurn/Makefile
+lib/python/Plugins/Extensions/DVDBurn/meta/Makefile
 lib/python/Plugins/Extensions/DVDPlayer/Makefile
+lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile
 lib/python/Plugins/Extensions/DVDPlayer/src/Makefile
+lib/python/Plugins/Extensions/GraphMultiEPG/Makefile
+lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile
+lib/python/Plugins/Extensions/Makefile
+lib/python/Plugins/Extensions/MediaPlayer/Makefile
+lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile
+lib/python/Plugins/Extensions/MediaScanner/Makefile
+lib/python/Plugins/Extensions/MediaScanner/meta/Makefile
+lib/python/Plugins/Extensions/Modem/Makefile
 lib/python/Plugins/Extensions/PicturePlayer/Makefile
+lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile
 lib/python/Plugins/Extensions/PicturePlayer/data/Makefile
-lib/python/Plugins/Extensions/GraphMultiEPG/Makefile
 lib/python/Plugins/Extensions/SocketMMI/Makefile
+lib/python/Plugins/Extensions/SocketMMI/meta/Makefile
 lib/python/Plugins/Extensions/SocketMMI/src/Makefile
-lib/python/Plugins/Extensions/Modem/Makefile
+lib/python/Plugins/Extensions/TuxboxPlugins/Makefile
+lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile
+lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile
+lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile
+lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile
+lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile
+lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile
+lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile
+lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile
+lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile
+lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile
+lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile
+lib/python/Plugins/SystemPlugins/Hotplug/Makefile
+lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile
+lib/python/Plugins/SystemPlugins/Makefile
+lib/python/Plugins/SystemPlugins/NFIFlash/Makefile
+lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile
+lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile
+lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile
+lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile
+lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile
+lib/python/Plugins/SystemPlugins/Satfinder/Makefile
+lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile
+lib/python/Plugins/SystemPlugins/SkinSelector/Makefile
+lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile
+lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile
+lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile
+lib/python/Plugins/SystemPlugins/VideoTune/Makefile
+lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile
+lib/python/Plugins/SystemPlugins/Videomode/Makefile
+lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile
 lib/python/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile

diff --git a/lib/python/Plugins/Extensions/CutListEditor/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
index 9d3b38ff4257bf9f95a29c407b5564790eb84bfb..7c77ccd7f95aabbf93ae63586fea20e4e2257816 100644 (file)
--- a/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
+++ b/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions/CutListEditor
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
index 5f33c5217516fa05bff8416c5a87e216758e4b71..d76b542b8c8ed23726f5a6337f4be1dc8857eed2 100755 (executable)
--- a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_cutlisteditor.xml *.jpg

diff --git a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am
index e0e3535c3424d10114d5cbad55c70cbc663c93a3..76a8ce2b084b498da8c387964998f4c8c1da514e 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions/DVDBurn
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py \

diff --git a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
index f40c2025add42be8191de4af73f2446f26aa5ce4..a6f0a43912502fc360e053b7edfaee51fee69e7b 100755 (executable)
--- a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_dvdburn.xml

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
index 1f82437eb7814acb07ec7528017f82bd43772dde..d1a995cac160a1c21adcf67459f4935c36f926f0 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
@@ -1,5 +1,5 @@
 if HAVE_DDVDLIB
-SUBDIRS = src
+SUBDIRS = src meta
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
 

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
index 68e1e077c9aba6459d4a0092abb2b5e12ea91a54..42b7be5a71e8aa0fc9f8ee0e67596257e05e49c1 100755 (executable)
--- a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_dvdplayer.xml *.jpg

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am
index bf6cf459a45611a768c96160591d66bdd97730f0..a5ef680577a0541ced487a68a780ac2a032048aa 100644 (file)
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions/GraphMultiEPG
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py \

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
index bd1fd67fd1d655486cbe6241939413b0c6ca6d93..ccf2eac21933a91e64693df5abdf22c6d5d009b2 100755 (executable)
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_graphmultiepg.xml *.jpg

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/Makefile.am b/lib/python/Plugins/Extensions/MediaPlayer/Makefile.am
index 1a3bc3e381374e2c5b4886644649ae566118c162..b99b29efee85b9ea916dd3c095f73df1c8ec6fd0 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaPlayer/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaPlayer/Makefile.am
@@ -1,4 +1,6 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions/MediaPlayer
 
+SUBDIRS = meta
+
 install_PYTHON = \
        __init__.py plugin.py settings.py

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
index c93f3077a536871c412fdbb72b753773598ecd57..007062227ac31346b9d852eafdf33167a4d3c555 100755 (executable)
--- a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_mediaplayer.xml *.jpg

diff --git a/lib/python/Plugins/Extensions/MediaScanner/Makefile.am b/lib/python/Plugins/Extensions/MediaScanner/Makefile.am
index 3b9f446ede5e430a7c27ceb37fef3ea802b29a56..2e98fe381c2253bed84ddff56d8dce2223cbe525 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaScanner/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaScanner/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions/MediaScanner
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
index 06f35311592b78b52a048e224f3a01c8d595e974..a83c4b481367f098608f968c818a7fa35f29c9a9 100755 (executable)
--- a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_mediascanner.xml

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am
index ffb2921cee465cadd4a0af6af31e3085d5f68c56..7ae18f6315f0f2dbb9ebcd7b84709834b090a798 100644 (file)
--- a/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am
+++ b/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data
+SUBDIRS = data meta
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/PicturePlayer
 

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
index 4f99fbfc1748952d724075a53d62cde372ba647a..d6574a4044c0eae0cbdd996ce47d01b1cfb2aa4b 100755 (executable)
--- a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_pictureplayer.xml *.jpg

diff --git a/lib/python/Plugins/Extensions/SocketMMI/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/Makefile.am
index 8f13a27fc5ca9a24be0e8db46f497e42baa41850..808d8520f52240732cd2699d779f25a31e8e930f 100644 (file)
--- a/lib/python/Plugins/Extensions/SocketMMI/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src meta
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI
 

diff --git a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
index 1d1578d49c400e607fc011921a7d12a7aa5e0d9d..d957e22ba5520ad77606397d1d8b60f686eb3ffd 100755 (executable)
--- a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_socketmmi.xml

diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am
index 9f6ce78825a6085c001828b4194d5e6f75146252..4fe45954cd3ea37695aafe41289f728f4567bc82 100755 (executable)
--- a/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am
+++ b/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions/TuxboxPlugins
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py \

diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
index d6cfc629b4e811ba41866c7b99c1bef9af508e9e..ab8e51699138fc22e02a358931a6c74ac5a314ed 100755 (executable)
--- a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_tuxboxplugins.xml

diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am
index 29027b5ef74713b3d4cbf55610ca8884346fc912..5676e5f0a040ce03d26ed14f1862628691c70e1a 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/CommonInterfaceAssignment
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
index b480fd297c64850265162cd63f0c8998fed789aa..d07f0580c12b4a887e3da73354deee90a9e2ccef 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_commoninterfaceassignment.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am
index 2e8dac615209d2238307fd3794cb040aac69c640..90c15720f7859ff8cbccb6a57923a17f80026644 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/CrashlogAutoSubmit
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
index 6232ed21e3bb50060dad10992c12d0700b709a96..39d584d76148bb54ad4f0cbe2a282a55d5259346 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_crashlogautosubmit.xml

diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am
index eeb3a3a38da7179fb9060439fa683f6672890da9..accfdaf814ae89ea389147765c20b2dda53d2d59 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/DefaultServicesScanner
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
index 77096696c84d74b8a50504e683c35e7e7d401409..f157dcaa8213d452648f3a4c5f27eca4ff2f5b57 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_defaultservicesscanner.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am
index 212fad4a86516a43bbc1ed4904d6122edcf5d371..18f4c1f36dbd30d7e1ebc94da2e4bf7eb8fd9f82 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/DiseqcTester
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py
\ No newline at end of file

diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
index f0c60ab2a8db2a5e2324a0159b3cf2bbec815e45..a3c91916374c84a124970a098aa099dbaa0b12d2 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_diseqctester.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am
index ea9b60570c39361e4d6feb6aad611c7bcfb6aae3..0f9c2d7aea0f0ec4e8abcf21ece1a4147acb4c99 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/FrontprocessorUpgrade
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
index 3a3853de439701a0863a53b118f08363ee98d20f..dae05092b12732f98bc4e607c4938be178c449f6 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_frontprocessorupgrade.xml

diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am b/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am
index 60ba49fcc17c4010926a9c07ad58ae30a4604984..db9e762523e00207c34ccf219789cca75ad79bf4 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Hotplug
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
index 41ba6c3f95078a7544dd353f580fab4a3753f0da..3a9525d1d30b6d5de5a0fe9b0ff5bc6de25ae2f2 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_hotplug.xml

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am
index fe5ea4cd5e43b29a6814f74f34d7ced735fd45d9..aa2c56a8986479fb2613c7a46e4e1325901cfe13 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/NFIFlash
 
+SUBDIRS = meta
+
 install_PYTHON = __init__.py plugin.py downloader.py flasher.py
 
 #install_SCRIPTS = mywritenand dm8000_writenand

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
index c32e7d6954633647e111ba559f0c6b0f7300e5d4..1a6879f9dbc434fbb43687a20c0cdc52d4cae252 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_nfiflash.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am
index b1019b3d1371351d7a955ca11cced17fd6d7daf6..e9d99c29c5ce7734a13e28cf0e69bdcff04f8a4e 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/PositionerSetup
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
index 2b3c0fa945673761fe462bd571278ddcab121594..1e8daff10cb25d7c2b54478fbd7fdd166d394284 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_positionersetup.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am
index ea2fcd4ea782fde1dad3258b40deca20f66acfcf..ca63367bd808ee216ccdf6f92333331187f1ca80 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SatelliteEquipmentControl
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
index 0f77f519105792a7f87546f8ad7cc570d6dbb071..d8a30a7f630c273955742d7c5a3cc0f5ac163691 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_satelliteequipmentcontrol.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am b/lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am
index c1d0ab58a9d1b4560d1bcc45aab93417a865d6a1..d1a66a9b3914075d920c1de4e1eb8a94fef5d0bd 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Satfinder
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
index a059ada6103466bcceff7cfd5f2ba7e90c8f824c..2134b998ca3d9861d23ff2cec348a0ade8a0ca77 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_satfinder.xml *.jpg
 

diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am b/lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am
index 5c0e97848daaffec96fbba59a16151e68487ff54..cfb100514954c76911a2c6379fcd4a6cee526b0c 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SkinSelector
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py \

diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
index 85a0144ad6a856b343254a90c580a7d68b0d1dd2..9568945bbd836d2e71984ab4458b5e07ad8feb52 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_skinselector.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am
index 1847d09d849ef89efc6bfc7de3e6cdb66e559a0c..b8f38c43015bbdb539a6625ee372d5dc1aaa5713 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SoftwareManager
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py \

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
index 8524904c864a842c3aefea57d5898498cca4aa16..6a6b4b4e706ccab111f68cfdb2b6acc5aaa3f20f 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_softwaremanager.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am
index 9153ef8c971a95cdb6febfde9b3396f05774ea97..549cda9968f2af8cd3d3fd760634bd7f4f40b844 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/VideoTune
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py VideoFinetune.py

diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
index 8448868da3e0010b4fcb336d357ed864ac8ae4ad..1feb155eb693d2e56829a54796fc9a0d6af95d9d 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_videotune.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am
index 215a29b39967fede594f4c64e2aeb67b89002217..830889d7aa689f38f0814ae23e1e3940c2ca6f23 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am
@@ -1,5 +1,7 @@
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Videomode
 
+SUBDIRS = meta
+
 install_PYTHON =       \
        __init__.py \
        plugin.py \

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
index da0efe830dc5229b1ac17a1c1275c15cf7a68c09..f69536cafe7573b82cc46bbc2373625e2036d7d6 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkglibdir)/python/Plugins/meta/
+installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_videomode.xml *.jpg