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

29 files changed, 29 insertions, 29 deletions

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