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

diff --git a/configure.ac b/configure.ac
index cba4cfa..8e8453a 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/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/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/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/Makefile

+lib/python/Plugins/Extensions/DVDBurn/meta/Makefile

 lib/python/Plugins/Extensions/DVDPlayer/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/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/Makefile

+lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile

 lib/python/Plugins/Extensions/PicturePlayer/data/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/Makefile

+lib/python/Plugins/Extensions/SocketMMI/meta/Makefile

 lib/python/Plugins/Extensions/SocketMMI/src/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
 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 9d3b38f..7c77ccd 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
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/CutListEditor
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 5f33c52..d76b542 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
 
 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 e0e3535..76a8ce2 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
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/DVDBurn
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py \
 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 f40c202..a6f0a43 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
 
 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 1f82437..d1a995c 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
 if HAVE_DDVDLIB

-SUBDIRS = src
+SUBDIRS = src meta

 
 installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
 
 
 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 68e1e07..42b7be5 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
 
 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 bf6cf45..a5ef680 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
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/GraphMultiEPG
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py \
 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 bd1fd67..ccf2eac 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
 
 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 1a3bc3e..b99b29e 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
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/MediaPlayer
 

+SUBDIRS = meta
+

 install_PYTHON = \
        __init__.py plugin.py settings.py
 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 c93f307..0070622 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
 
 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 3b9f446..2e98fe3 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
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/MediaScanner
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 06f3531..a83c4b4 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
 
 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 ffb2921..7ae18f6 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
 
 
 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 4f99fbf..d6574a4 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
 
 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 8f13a27..808d852 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
 
 
 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 1d1578d..d957e22 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
 
 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 9f6ce78..4fe4595 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
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/TuxboxPlugins
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py \
 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 d6cfc62..ab8e516 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
 
 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 29027b5..5676e5f 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/CommonInterfaceAssignment
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 b480fd2..d07f058 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
 
 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 2e8dac6..90c1572 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/CrashlogAutoSubmit
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 6232ed2..39d584d 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
 
 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 eeb3a3a..accfdaf 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/DefaultServicesScanner
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 7709669..f157dca 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
 
 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 212fad4..18f4c1f 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/DiseqcTester
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
\ No newline at end of file
 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 f0c60ab..a3c9191 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
 
 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 ea9b605..0f9c2d7 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/FrontprocessorUpgrade
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 3a3853d..dae0509 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
 
 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 60ba49f..db9e762 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Hotplug
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 41ba6c3..3a9525d 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
 
 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 fe5ea4c..aa2c56a 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/NFIFlash
 

+SUBDIRS = meta
+

 install_PYTHON = __init__.py plugin.py downloader.py flasher.py
 
 #install_SCRIPTS = mywritenand dm8000_writenand
 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 c32e7d6..1a6879f 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
 
 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 b1019b3..e9d99c2 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/PositionerSetup
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 2b3c0fa..1e8daff 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
 
 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 ea2fcd4..ca63367 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SatelliteEquipmentControl
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 0f77f51..d8a30a7 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
 
 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 c1d0ab5..d1a66a9 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Satfinder
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py
 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 a059ada..2134b99 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
 
 
 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 5c0e978..cfb1005 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SkinSelector
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py \
 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 85a0144..9568945 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
 
 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 1847d09..b8f38c4 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SoftwareManager
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py \
 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 8524904..6a6b4b4 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
 
 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 9153ef8..549cda9 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/VideoTune
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py VideoFinetune.py
 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 8448868..1feb155 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
 
 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 215a29b..830889d 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
 
 installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Videomode
 

+SUBDIRS = meta
+

 install_PYTHON =       \
        __init__.py \
        plugin.py \
 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 da0efe8..f69536c 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
 
 dist_install_DATA = plugin_videomode.xml *.jpg