From 93119b6552ecbfebf92d96a6aef2049b0fb1f600 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sat, 15 Aug 2009 16:59:30 +0200 Subject: 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 --- lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am | 2 +- lib/python/Plugins/Extensions/CutListEditor/Makefile.am | 2 +- lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am | 2 +- lib/python/Plugins/Extensions/DVDBurn/Makefile.am | 2 +- lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am | 2 +- lib/python/Plugins/Extensions/DVDPlayer/Makefile.am | 2 +- lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am | 2 +- lib/python/Plugins/Extensions/FileManager/Makefile.am | 2 +- lib/python/Plugins/Extensions/FritzCall/Makefile.am | 2 +- lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am | 2 +- lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am | 2 +- lib/python/Plugins/Extensions/MediaPlayer/Makefile.am | 2 +- lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am | 2 +- lib/python/Plugins/Extensions/MediaScanner/Makefile.am | 2 +- lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am | 2 +- lib/python/Plugins/Extensions/Modem/Makefile.am | 2 +- lib/python/Plugins/Extensions/PicturePlayer/Makefile.am | 2 +- lib/python/Plugins/Extensions/PicturePlayer/data/Makefile.am | 6 +----- lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am | 2 +- lib/python/Plugins/Extensions/SimpleRSS/Makefile.am | 2 +- lib/python/Plugins/Extensions/SocketMMI/Makefile.am | 2 +- lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am | 2 +- lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am | 2 +- lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am | 2 +- lib/python/Plugins/Makefile.am | 2 +- .../Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am | 2 +- .../SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am | 2 +- .../Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am | 2 +- .../Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am | 2 +- .../Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am | 2 +- .../Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am | 2 +- .../SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/Videomode/Makefile.am | 2 +- lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am | 2 +- 54 files changed, 54 insertions(+), 58 deletions(-) (limited to 'lib/python/Plugins') diff --git a/lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am b/lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am index 2c52330f..d5ebf225 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/CutListEditor/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/Makefile.am index e8f5b4b1..9f48bf3e 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am index 7b5bef3a..30b7d88f 100755 --- 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 diff --git a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am index be89ebaa..9b25d9d2 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am index f9a3ad73..c4ba6aa6 100755 --- 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 diff --git a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am index 45c410fa..1f82437e 100644 --- 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 -installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/DVDPlayer +installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer 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 6d2e2ec0..a9a88159 100755 --- 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 diff --git a/lib/python/Plugins/Extensions/FileManager/Makefile.am b/lib/python/Plugins/Extensions/FileManager/Makefile.am index 0a792e75..029b738c 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/FritzCall/Makefile.am b/lib/python/Plugins/Extensions/FritzCall/Makefile.am index e3905e1a..5fb8eca1 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am index d0b82585..a2b58418 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am index 0d1f4a6b..ddaf228e 100755 --- 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 diff --git a/lib/python/Plugins/Extensions/MediaPlayer/Makefile.am b/lib/python/Plugins/Extensions/MediaPlayer/Makefile.am index 123df22d..1a3bc3e3 100644 --- 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 diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am index 23d591af..29a07d04 100755 --- 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 diff --git a/lib/python/Plugins/Extensions/MediaScanner/Makefile.am b/lib/python/Plugins/Extensions/MediaScanner/Makefile.am index d304373b..3b9f446e 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am index 959a1bf5..ab4bd3b5 100755 --- 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 diff --git a/lib/python/Plugins/Extensions/Modem/Makefile.am b/lib/python/Plugins/Extensions/Modem/Makefile.am index 3fc61053..852c9357 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am index 61d5b3d4..ffb2921c 100644 --- a/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am +++ b/lib/python/Plugins/Extensions/PicturePlayer/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = data -installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/PicturePlayer +installdir = $(pkglibdir)/python/Plugins/Extensions/PicturePlayer 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 15b5fa02..a287620c 100644 --- 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 diff --git a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am index a06416a3..59a9a3c2 100755 --- 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 diff --git a/lib/python/Plugins/Extensions/SimpleRSS/Makefile.am b/lib/python/Plugins/Extensions/SimpleRSS/Makefile.am index 660a8df0..21cd6e12 100644 --- 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 \ diff --git a/lib/python/Plugins/Extensions/SocketMMI/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/Makefile.am index ce4d432f..52f9fe78 100644 --- a/lib/python/Plugins/Extensions/SocketMMI/Makefile.am +++ b/lib/python/Plugins/Extensions/SocketMMI/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = src -installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/SocketMMI +installdir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI 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 78595def..d1da4cd1 100755 --- 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 diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/Makefile.am index 83561546..9f6ce788 100755 --- 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 \ diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am index 8adb1b66..d001a1f0 100755 --- 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 diff --git a/lib/python/Plugins/Makefile.am b/lib/python/Plugins/Makefile.am index 1c18adb3..f0435036 100644 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile.am index 562b1491..29027b5e 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am index f192c235..df120e9f 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/Makefile.am index 23d14dae..bab60c45 100755 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am index 080a35fd..92e70f32 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile.am index 1d3b2f92..eeb3a3a3 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am index c1d432f6..17a57212 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am index cd72696a..212fad4a 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am index 9d7cc668..ff508396 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am index 514b62b9..ea9b6057 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am index 8a976adc..780a2f47 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am b/lib/python/Plugins/SystemPlugins/Hotplug/Makefile.am index fa70242e..5966e538 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am index 6bba92bf..c7b7de86 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am index cbb69572..c93d714c 100644 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am index d188ac78..ae8472f9 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/Makefile.am b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/Makefile.am index 962ff487..a4ef3783 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile.am index 0546ca74..ae910403 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am index 2efe5848..7d45e836 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile.am index 3f2dbd7e..36c64122 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am index bbec9958..35162a44 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am b/lib/python/Plugins/SystemPlugins/Satfinder/Makefile.am index cedad9b9..edf4150a 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am index a6370cda..770c0889 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am b/lib/python/Plugins/SystemPlugins/SkinSelector/Makefile.am index 3a363fb5..5c0e9784 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am index 5c7f4bb2..fcff8c41 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am index f94498f5..32a07da4 100755 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am index bf1d3491..a15a6334 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoTune/Makefile.am index b4fe1d56..a682c516 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am index cdbcee14..9f11433f 100755 --- 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 diff --git a/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am index 4c1b7d61..331a1ff9 100644 --- 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 \ diff --git a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am index 190dd9d1..235e3b5d 100755 --- 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 -- cgit v1.2.3