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

23 files changed, 23 insertions, 27 deletions

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