update all Makefile.am files

remove 'AUTOMAKE_OPTIONS = gnu', which is the default,
use pkgdatadir instead of $(DATADIR)/enigma2,
use pkglibdir instead of $(LIBDIR)/enigma2

diff --git a/Makefile.am b/Makefile.am
index fd1a7c5f7080333fbe451c66d026661b4cff442e..813e4f7d77ae266b1a599f7bbee845fdfed999f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@
-AUTOMAKE_OPTIONS = gnu
-

 SUBDIRS = lib main data po tools
 
 SUBDIRS = lib main data po tools
 

-installdir = $(LIBDIR)/enigma2/python
+installdir = $(pkglibdir)/python

 
 install_PYTHON = \
        Navigation.py NavigationInstance.py RecordTimer.py SleepTimer.py ServiceReference.py \
 
 install_PYTHON = \
        Navigation.py NavigationInstance.py RecordTimer.py SleepTimer.py ServiceReference.py \

diff --git a/data/Makefile.am b/data/Makefile.am
index fce28bd01059875dc1d4defd3d16872cd25e7bc1..3c188cbaa44708b5fe2e875306b9218985e32c3e 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
-

 SUBDIRS = countries fonts defaults extensions skin_default
 
 SUBDIRS = countries fonts defaults extensions skin_default
 

-installdir = $(DATADIR)/enigma2
-
-install_DATA = \
+pkgdata_DATA = \

        *.xml *.png encoding.conf radio.mvi
        *.xml *.png encoding.conf radio.mvi

diff --git a/data/countries/Makefile.am b/data/countries/Makefile.am
index 7b2ccc0316208cfb0c142bc992efe001a5720c5a..4b02f4c6afc9f215078025f0ad27cae8d50293dd 100644 (file)
--- a/data/countries/Makefile.am
+++ b/data/countries/Makefile.am
@@ -1,6 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
-
-installdir = $(DATADIR)/enigma2/countries
+installdir = $(pkgdatadir)/countries

 
 install_DATA = \
        *.png
 
 install_DATA = \
        *.png

diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am
index e37e095dc38c4973a6c53d0d6799a8d5a5ee1d54..65ce58a8056d2cbb3cf79e82fd416c9ea8e72489 100644 (file)
--- a/data/defaults/Dream/Makefile.am
+++ b/data/defaults/Dream/Makefile.am
@@ -1,8 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
-
-# SUBDIRS = packages
-
-installdir = $(DATADIR)/enigma2/defaults/Dream
+installdir = $(pkgdatadir)/defaults/Dream

 
 install_DATA = \
        *.info \
 
 install_DATA = \
        *.info \

diff --git a/data/defaults/Makefile.am b/data/defaults/Makefile.am
index 054047e57bbd053c57c2ac96cb713655ebdf0a1f..a02b0153ef3846f269d0f1a371392dffcc58ca76 100644 (file)
--- a/data/defaults/Makefile.am
+++ b/data/defaults/Makefile.am
@@ -1,8 +1 @@
-AUTOMAKE_OPTIONS = gnu
-

 SUBDIRS = Dream
 SUBDIRS = Dream

-
-installdir = $(DATADIR)/enigma2/defaults
-
-#install_DATA = \
-#      userbouquet.favourites.tv bouquets.tv

diff --git a/data/extensions/Makefile.am b/data/extensions/Makefile.am
index e1663ddd3d90d2a88def29d51fd63c44ce63e635..9e51087c5c22d05e8adc021a14a8cde24709cb43 100644 (file)
--- a/data/extensions/Makefile.am
+++ b/data/extensions/Makefile.am
@@ -1,6 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
-
-installdir = $(DATADIR)/enigma2/extensions
+installdir = $(pkgdatadir)/extensions

 
 install_DATA = \
        *.png
 
 install_DATA = \
        *.png

diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index 8f8454353cf1887b32f8950820a92a82370498c9..67adb96ec114fef127f252722f4f937b761a2c07 100644 (file)
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = gnu
-

 installdir = $(FONTDIR)
 
 install_DATA = \
 installdir = $(FONTDIR)
 
 install_DATA = \

diff --git a/data/skin_default/Makefile.am b/data/skin_default/Makefile.am
index 38102c77c48712a99a7fac379e9f05c672076505..ae4b42c7262af0de3270a2a611c51fd2c88a9eaf 100644 (file)
--- a/data/skin_default/Makefile.am
+++ b/data/skin_default/Makefile.am
@@ -1,8 +1,6 @@
-AUTOMAKE_OPTIONS = gnu
-

 SUBDIRS = menu icons buttons spinner
 
 SUBDIRS = menu icons buttons spinner
 

-installdir = $(DATADIR)/enigma2/skin_default
+installdir = $(pkgdatadir)/skin_default

 
 install_DATA = \
        *.png
 
 install_DATA = \
        *.png

diff --git a/data/skin_default/buttons/Makefile.am b/data/skin_default/buttons/Makefile.am
index 40af0229df244fa1ca728be1cf5681ea5ab760e2..bf68be4290d465cb4d2bd98de6f084f85256b273 100644 (file)
--- a/data/skin_default/buttons/Makefile.am
+++ b/data/skin_default/buttons/Makefile.am
@@ -1,6 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
-
-installdir = $(DATADIR)/enigma2/skin_default/buttons
+installdir = $(pkgdatadir)/skin_default/buttons

 
 install_DATA = \
        *.png
 
 install_DATA = \
        *.png

diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am
index 999adc54c3a211ff9a2fcbdc75d25b01bbf7919c..6dfeaedcc05fc4eb9c0df392d093804fb32f405d 100644 (file)
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@ -1,6 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
-
-installdir = $(DATADIR)/enigma2/skin_default/icons
+installdir = $(pkgdatadir)/skin_default/icons

 
 install_DATA = \
        *.png
 
 install_DATA = \
        *.png

diff --git a/data/skin_default/menu/Makefile.am b/data/skin_default/menu/Makefile.am
index a6476baadc4977cab93cf0e2d247350cbbd84671..e7c4d797c064f97bec4c5ce7cb3f3a64202f52a4 100644 (file)
--- a/data/skin_default/menu/Makefile.am
+++ b/data/skin_default/menu/Makefile.am
@@ -1,6 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
-
-installdir = $(DATADIR)/enigma2/skin_default/menu
+installdir = $(pkgdatadir)/skin_default/menu

 
 install_DATA = \
        *.png
 
 install_DATA = \
        *.png

diff --git a/data/skin_default/spinner/Makefile.am b/data/skin_default/spinner/Makefile.am
index b6cf5f2e4a52fca9b8ff949abd3bc3b65616ff14..44e3b91b489bcde1237ce0047dbb555fa8da4d14 100644 (file)
--- a/data/skin_default/spinner/Makefile.am
+++ b/data/skin_default/spinner/Makefile.am
@@ -1,6 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
-
-installdir = $(DATADIR)/enigma2/skin_default/spinner
+installdir = $(pkgdatadir)/skin_default/spinner

 
 install_DATA = \
        *.png
 
 install_DATA = \
        *.png

diff --git a/lib/python/Components/Converter/Makefile.am b/lib/python/Components/Converter/Makefile.am
index da226f82d08c0c92e1bc9e14c23f7ca00dcb746c..75c8a08ec9d10ef8d9a1cdb0385b8b970c745b5d 100644 (file)
--- a/lib/python/Components/Converter/Makefile.am
+++ b/lib/python/Components/Converter/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Components/Converter
+installdir = $(pkglibdir)/python/Components/Converter

 
 install_PYTHON = \
        __init__.py ClockToText.py Converter.py EventName.py StaticText.py EventTime.py \
 
 install_PYTHON = \
        __init__.py ClockToText.py Converter.py EventName.py StaticText.py EventTime.py \

diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am
index 85e4d3ec00ff61d17448a76d6e4edb2a0b774c8e..34710fa15b70ad87072498a22c71994e0bf04245 100755 (executable)
--- a/lib/python/Components/Makefile.am
+++ b/lib/python/Components/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Components
+installdir = $(pkglibdir)/python/Components

 
 SUBDIRS = Sources Converter Renderer
 
 
 SUBDIRS = Sources Converter Renderer
 

diff --git a/lib/python/Components/Renderer/Makefile.am b/lib/python/Components/Renderer/Makefile.am
index 371c8d7218cdd135c252dc0d653660333c464c68..9f3b262f168fa7cd34453c4accf34b06599a7c47 100644 (file)
--- a/lib/python/Components/Renderer/Makefile.am
+++ b/lib/python/Components/Renderer/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Components/Renderer
+installdir = $(pkglibdir)/python/Components/Renderer

 
 install_PYTHON = \
        __init__.py Label.py Progress.py Listbox.py Renderer.py Pixmap.py \
 
 install_PYTHON = \
        __init__.py Label.py Progress.py Listbox.py Renderer.py Pixmap.py \

diff --git a/lib/python/Components/Sources/Makefile.am b/lib/python/Components/Sources/Makefile.am
index d04013ff5aedd37b21c840945456523d05632b59..6ef8cac6542c2bdc970b3461d29ebbcc2863f51b 100644 (file)
--- a/lib/python/Components/Sources/Makefile.am
+++ b/lib/python/Components/Sources/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Components/Sources
+installdir = $(pkglibdir)/python/Components/Sources

 
 install_PYTHON = \
        __init__.py Clock.py EventInfo.py Source.py List.py CurrentService.py \
 
 install_PYTHON = \
        __init__.py Clock.py EventInfo.py Source.py List.py CurrentService.py \

diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am
index 1877efc127d30f3287fd46e4b30e6b341f420433..e38f7d8240eb308ae0d1dbc2c75ee4b709f825a6 100644 (file)
--- a/lib/python/Makefile.am
+++ b/lib/python/Makefile.am
@@ -17,7 +17,7 @@ enigma.py: enigma_python_wrap.cxx
 
 CLEANFILES = enigma.py enigma_python_wrap.cxx
 
 
 CLEANFILES = enigma.py enigma_python_wrap.cxx
 

-installdir = $(LIBDIR)/enigma2/python
+installdir = $(pkglibdir)/python

 
 install_PYTHON = \
        enigma.py
 
 install_PYTHON = \
        enigma.py

diff --git a/lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am b/lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am
index 2c52330feb747c464668bd806b721a23a2cbb9a3..d5ebf225497ec39a5e7f9287b86e61a7f85f0f29 100644 (file)
--- a/lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am
+++ b/lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/DemoPlugins/TestPlugin
+installdir = $(pkglibdir)/python/Plugins/DemoPlugins/TestPlugin

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/CutListEditor/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
index e8f5b4b13a4de476376316eff7cf4cbc11413c23..9f48bf3e97a8e748a2b23cb12b31bcb560afe203 100644 (file)
--- a/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
+++ b/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/CutListEditor
+installdir = $(pkglibdir)/python/Plugins/Extensions/CutListEditor

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
index 7b5bef3a5c3bf3f476f0cbd1dc77c59616cbf65a..30b7d88f75ddcfe98f64f1919b60069ae941ee04 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_cutlisteditor.xml *.jpg
 
 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 be89ebaa9e5f3f23ff5d5a2b6f213bb1565dae5b..9b25d9d29b00e17dd4601aeaefdc19c0a10d981d 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/DVDBurn
+installdir = $(pkglibdir)/python/Plugins/Extensions/DVDBurn

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
index f9a3ad736cc86f345f960ce0e7aeae6089f8f92c..c4ba6aa60c3cb4ddacf4c061303a55c5662f8c4c 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_dvdburn.xml
 
 install_DATA = plugin_dvdburn.xml

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
index 45c410faae3453dd71c69f65cc4078b52b24bfc5..1f82437eb7814acb07ec7528017f82bd43772dde 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_DDVDLIB
 SUBDIRS = src
 
 if HAVE_DDVDLIB
 SUBDIRS = src
 

-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/DVDPlayer
+installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer

 
 install_PYTHON = \
        src/servicedvd.so \
 
 install_PYTHON = \
        src/servicedvd.so \

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
index 6d2e2ec0b67d870591049e578cca7ecc9dd45454..a9a881598118cf314259cb3c4b1a3b8f312a8695 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_dvdplayer.xml *.jpg
 
 install_DATA = plugin_dvdplayer.xml *.jpg

diff --git a/lib/python/Plugins/Extensions/FileManager/Makefile.am b/lib/python/Plugins/Extensions/FileManager/Makefile.am
index 0a792e757788d3f8fb6847ce76158a515dfd93f3..029b738c8b25c3de3f4c257853e82a1eedabae6b 100644 (file)
--- a/lib/python/Plugins/Extensions/FileManager/Makefile.am
+++ b/lib/python/Plugins/Extensions/FileManager/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/FileManager
+installdir = $(pkglibdir)/python/Plugins/Extensions/FileManager

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/FritzCall/Makefile.am b/lib/python/Plugins/Extensions/FritzCall/Makefile.am
index e3905e1a93782a2008929ffc670c968545eb8bfd..5fb8eca18fee52fcf1a5719234409eb3c1e95666 100644 (file)
--- a/lib/python/Plugins/Extensions/FritzCall/Makefile.am
+++ b/lib/python/Plugins/Extensions/FritzCall/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/FritzCall
+installdir = $(pkglibdir)/python/Plugins/Extensions/FritzCall

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am
index d0b8258564564362210d2fe8ce8f3aa925a1a1b7..a2b58418c338c8caac2115c3bdb3c5e4da6a01c3 100644 (file)
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/GraphMultiEPG
+installdir = $(pkglibdir)/python/Plugins/Extensions/GraphMultiEPG

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
index 0d1f4a6bfbc2f9219339445cc84ee1ad8a789c47..ddaf228eec693fb042814e0bc285dfba9236e4df 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_graphmultiepg.xml *.jpg
 
 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 123df22df7b24ff539b4b620a3a2bdec2d105ace..1a3bc3e381374e2c5b4886644649ae566118c162 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaPlayer/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaPlayer/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/MediaPlayer
+installdir = $(pkglibdir)/python/Plugins/Extensions/MediaPlayer

 
 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 23d591af33ca502def44f82be42b80e572a7264b..29a07d04d2af5aa93a2129985b84a6eef99c2efd 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_mediaplayer.xml *.jpg
 
 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 d304373b9d53fc3da8b15764e0339eafeb244859..3b9f446ede5e430a7c27ceb37fef3ea802b29a56 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaScanner/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaScanner/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/MediaScanner
+installdir = $(pkglibdir)/python/Plugins/Extensions/MediaScanner

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
index 959a1bf59cd3656bfb2481467b113c6a336367ce..ab4bd3b57d9a9d019f58d5f3561202c49ad1f8a8 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_mediascanner.xml
 
 install_DATA = plugin_mediascanner.xml

diff --git a/lib/python/Plugins/Extensions/Modem/Makefile.am b/lib/python/Plugins/Extensions/Modem/Makefile.am
index 3fc610530e0d4eb5ccd7493e39279ccb4a7d3fe2..852c93579b0cf50cc8a3151cb382cd9a04335f22 100644 (file)
--- a/lib/python/Plugins/Extensions/Modem/Makefile.am
+++ b/lib/python/Plugins/Extensions/Modem/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/Modem
+installdir = $(pkglibdir)/python/Plugins/Extensions/Modem

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am
index 61d5b3d4634adb2c7e3fb666cb9cd7f70027d026..ffb2921cee465cadd4a0af6af31e3085d5f68c56 100644 (file)
--- a/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am
+++ b/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = data
 
 SUBDIRS = data
 

-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/PicturePlayer
+installdir = $(pkglibdir)/python/Plugins/Extensions/PicturePlayer

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/data/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/data/Makefile.am
index 15b5fa02d12b322790909602894efe1a8039ada5..a287620c32a28d4bc11d8aa9a32b34d2c7e88c73 100644 (file)
--- a/lib/python/Plugins/Extensions/PicturePlayer/data/Makefile.am
+++ b/lib/python/Plugins/Extensions/PicturePlayer/data/Makefile.am
@@ -1,6 +1,2 @@
-AUTOMAKE_OPTIONS = gnu
-
-installdir = $(DATADIR)/enigma2
-
-install_DATA = \
+pkgdata_DATA = \

        pic_frame.png
        pic_frame.png

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
index a06416a3fa23922d7882a824f2b056a512094f89..59a9a3c26af255c4de8ac801ec57c691036a5890 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_pictureplayer.xml *.jpg
 
 install_DATA = plugin_pictureplayer.xml *.jpg

diff --git a/lib/python/Plugins/Extensions/SimpleRSS/Makefile.am b/lib/python/Plugins/Extensions/SimpleRSS/Makefile.am
index 660a8df06cd6e21f1e89fe4082d08a8a6a53ea18..21cd6e1299bac4b21fb189007063c42f27fd4871 100644 (file)
--- a/lib/python/Plugins/Extensions/SimpleRSS/Makefile.am
+++ b/lib/python/Plugins/Extensions/SimpleRSS/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/SimpleRSS
+installdir = $(pkglibdir)/python/Plugins/Extensions/SimpleRSS

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/SocketMMI/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/Makefile.am
index ce4d432fc1e5e40429cd491fe4eebf46ed8845a2..52f9fe78ae3ea049b9df1a489d0282e354593d4e 100644 (file)
--- a/lib/python/Plugins/Extensions/SocketMMI/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = src
 
 SUBDIRS = src
 

-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/SocketMMI
+installdir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI

 
 install_PYTHON = \
        src/socketmmi.so \
 
 install_PYTHON = \
        src/socketmmi.so \

diff --git a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
index 78595defcfa7f54a6674254d0a9dbf2681516f36..d1da4cd1614d557a3c3761bfc6ef5101c4e1392c 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_socketmmi.xml
 
 install_DATA = plugin_socketmmi.xml

diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am
index 8356154642e4798db1199bedfb0ddf6b565d162e..9f6ce78825a6085c001828b4194d5e6f75146252 100755 (executable)
--- a/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am
+++ b/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/TuxboxPlugins
+installdir = $(pkglibdir)/python/Plugins/Extensions/TuxboxPlugins

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
index 8adb1b668faf90718fe321cd20bfbab3fe1173b2..d001a1f066b1d6a80bdd86b551c0bed4c541dde6 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_tuxboxplugins.xml
 
 install_DATA = plugin_tuxboxplugins.xml

diff --git a/lib/python/Plugins/Makefile.am b/lib/python/Plugins/Makefile.am
index 1c18adb34fa7b0a0819c5fdfad6c09eef978e7d0..f04350364e7bac5cef2100c0ad06052c89cb43a6 100644 (file)
--- a/lib/python/Plugins/Makefile.am
+++ b/lib/python/Plugins/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins
+installdir = $(pkglibdir)/python/Plugins

 
 SUBDIRS = Extensions SystemPlugins DemoPlugins
 
 
 SUBDIRS = Extensions SystemPlugins DemoPlugins
 

diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am
index 562b1491206f05fcb3e00a6d653341f042aaf70e..29027b5ef74713b3d4cbf55610ca8884346fc912 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/CommonInterfaceAssignment
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/CommonInterfaceAssignment

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
index f192c235cfa3e1c0408aca53961fd3b0ca4790fe..df120e9ff002d5d4ff5b38318ff7bd4354ca03e0 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_commoninterfaceassignment.xml *.jpg
 
 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 23d14dae2fbe8af712b8317a36161fbdf16753ec..bab60c453646f6975cc7abe30028436786bd2a83 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/CrashlogAutoSubmit
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/CrashlogAutoSubmit

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
index 080a35fd347d7e43831ad4b8f2212cf864367a62..92e70f32439db56fff87a936b509e7608e81bddb 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_crashlogautosubmit.xml
 
 install_DATA = plugin_crashlogautosubmit.xml

diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am
index 1d3b2f92cec4b5ca96632e9a0ba50ee3f039b9fe..eeb3a3a38da7179fb9060439fa683f6672890da9 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/DefaultServicesScanner
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/DefaultServicesScanner

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
index c1d432f69b89afef3341bb145b41906e097172a9..17a57212d0030e377a65eab02799901bd21f7c8f 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_defaultservicesscanner.xml *.jpg
 
 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 cd72696a483b48f06a97f813b0333bc44b0ef375..212fad4a86516a43bbc1ed4904d6122edcf5d371 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/DiseqcTester
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/DiseqcTester

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
index 9d7cc668ffbf1093c8fe2d796faedcfc34ccbfa2..ff508396a46b93e9bf55cdfbaab15e80ecb1f039 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_diseqctester.xml *.jpg
 
 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 514b62b9c45d1a33ae59a9b09be5b3eae15f3df9..ea9b60570c39361e4d6feb6aad611c7bcfb6aae3 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/FrontprocessorUpgrade
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/FrontprocessorUpgrade

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
index 8a976adc6d72a2b2cfa7e1a0e6cb9f2e7cd83d8a..780a2f470ff98e868ab84d35e649162b5884ada7 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_frontprocessorupgrade.xml
 
 install_DATA = plugin_frontprocessorupgrade.xml

diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am b/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am
index fa70242ea3e545d6bf6b8514b019721b1ca2a569..5966e5387963a5c71e884df4c02234fc2de67829 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/Hotplug
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Hotplug

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
index 6bba92bf01020805501c11acd62c751d8c76a14d..c7b7de86527d7c87f88e54c23979781643886764 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_hotplug.xml
 
 install_DATA = plugin_hotplug.xml

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am
index cbb69572d23de4ac5c87f59e60ed01fc93f5aa51..c93d714c0a0580afa77478d24027bdfcf6d9e46c 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/NFIFlash
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/NFIFlash

 
 install_PYTHON = __init__.py plugin.py downloader.py flasher.py
 
 
 install_PYTHON = __init__.py plugin.py downloader.py flasher.py
 

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
index d188ac78ba17a26572ecc8fe06e7f323fdfedb35..ae8472f99d289d859e2a5105bdc4f22ce91249e6 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_nfiflash.xml *.jpg
 
 install_DATA = plugin_nfiflash.xml *.jpg

diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/Makefile.am b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/Makefile.am
index 962ff48797b58eccee104c6f768f046a3fd32456..a4ef3783780d9e9d8cb0b801dc62518c25373dfa 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/OldSoftwareUpdate
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/OldSoftwareUpdate

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am
index 0546ca74e71c4bada2ae7cfb1473fd41202b89d9..ae91040309c2de3a68f2eab4ac45be7550170445 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/PositionerSetup
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/PositionerSetup

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
index 2efe5848b9b012680d21f952597089e49540cc2b..7d45e836aec727a40216f06fe09747eec822ecb1 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_positionersetup.xml *.jpg
 
 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 3f2dbd7e6162665e8c35116e5fd23e2be8fbb2f8..36c641229c286ef2fbb807fdfc0017563e42072e 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/SatelliteEquipmentControl
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SatelliteEquipmentControl

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
index bbec995894efb8e9737303036b40808433429373..35162a446ff4943ecb018727d4b55c5985e4929c 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_satelliteequipmentcontrol.xml *.jpg
 
 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 cedad9b9ad542a8a315976825e56a0bd1acc26c4..edf4150aade1ea9fdc15c4ae11e25dd24ef3445d 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/Satfinder
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Satfinder

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
index a6370cda3bb8ba182e5d81fc714a0aa9f14a0def..770c08895132d1c50f35efbb86077c68670d724e 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_satfinder.xml *.jpg
 
 
 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 3a363fb5f9f87128a92a7c5726059d642e97bcee..5c0e97848daaffec96fbba59a16151e68487ff54 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/SkinSelector
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SkinSelector

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
index 5c7f4bb2823d0d73125f9e75b32145995a2e77a8..fcff8c41e3f0741386e3ee8d5a0351d703c49927 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_skinselector.xml *.jpg
 
 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 f94498f5da8ad11d6ab116dff9715d7c4cb4da38..32a07da4309ca2b3440847741dcb7cedad0904d0 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/SoftwareManager
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/SoftwareManager

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
index bf1d34917035bc6a540ea976eed3c654594a50c5..a15a6334df995a27f39d4cf45b1c3d9e2654f605 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_softwaremanager.xml *.jpg
 
 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 b4fe1d564a5038882f60a62f18641fc0e02e3793..a682c5167e0bfb29286ca11a2832ddf709ed8bcf 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/VideoTune
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/VideoTune

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
index cdbcee144a03a5f260bd38520245e3054b7ba6a4..9f11433fa91b2676ab484b49fc368dbbc9d97fc6 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_videotune.xml *.jpg
 
 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 4c1b7d611a3735da885f5922a65413d1a9456e47..331a1ff952f68ac93ed7c636943dcdf87ab9800f 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/Videomode
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/Videomode

 
 install_PYTHON =       \
        __init__.py \
 
 install_PYTHON =       \
        __init__.py \

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
index 190dd9d1cb8f5259fc3457633d56979a042f99c2..235e3b5d5e1c300919c0cf213aecafd775e1dcee 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 = $(LIBDIR)/enigma2/python/Plugins/meta/
+installdir = $(pkglibdir)/python/Plugins/meta/

 
 install_DATA = plugin_videomode.xml *.jpg
 
 install_DATA = plugin_videomode.xml *.jpg

diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index ca67f73db14d031394e0d5b8588f8f8952353494..44994b86d0a5aab8c8d50b7364254459e02fb1ec 100755 (executable)
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Screens
+installdir = $(pkglibdir)/python/Screens

 
 install_PYTHON = \
        ChannelSelection.py ClockDisplay.py ConfigMenu.py InfoBar.py Menu.py    \
 
 install_PYTHON = \
        ChannelSelection.py ClockDisplay.py ConfigMenu.py InfoBar.py Menu.py    \

diff --git a/lib/python/Tools/Makefile.am b/lib/python/Tools/Makefile.am
index e7904d668c17f9a77f8e338353f8d4b81c0f9dce..aeeb954cd5949ea271af05b989df4819d4ca2159 100644 (file)
--- a/lib/python/Tools/Makefile.am
+++ b/lib/python/Tools/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Tools
+installdir = $(pkglibdir)/python/Tools

 
 install_PYTHON = \
        FuzzyDate.py XMLTools.py Directories.py NumericalTextInput.py \
 
 install_PYTHON = \
        FuzzyDate.py XMLTools.py Directories.py NumericalTextInput.py \

diff --git a/po/Makefile.am b/po/Makefile.am
index 2e9b9c920bcbfcd892593e8b3359a0fd0feab215..6f0010e3c1a7621e519352f902312525851d1e7a 100755 (executable)
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -52,6 +52,6 @@ clean-local:
 
 install-data-am: default
        for lang in $(LANGS); do \
 
 install-data-am: default
        for lang in $(LANGS); do \

-               mkdir -p $(DESTDIR)$(DATADIR)/enigma2/po/$$lang/LC_MESSAGES; \
-               cp $$lang.mo $(DESTDIR)$(DATADIR)/enigma2/po/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
+               mkdir -p $(DESTDIR)$(pkgdatadir)/po/$$lang/LC_MESSAGES; \
+               cp $$lang.mo $(DESTDIR)$(pkgdatadir)/po/$$lang/LC_MESSAGES/$(DOMAIN).mo; \

        done
        done