From 93119b6552ecbfebf92d96a6aef2049b0fb1f600 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sat, 15 Aug 2009 16:59:30 +0200 Subject: [PATCH] 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 --- Makefile.am | 4 +--- data/Makefile.am | 6 +----- data/countries/Makefile.am | 4 +--- data/defaults/Dream/Makefile.am | 6 +----- data/defaults/Makefile.am | 7 ------- data/extensions/Makefile.am | 4 +--- data/fonts/Makefile.am | 2 -- data/skin_default/Makefile.am | 4 +--- data/skin_default/buttons/Makefile.am | 4 +--- data/skin_default/icons/Makefile.am | 4 +--- data/skin_default/menu/Makefile.am | 4 +--- data/skin_default/spinner/Makefile.am | 4 +--- lib/python/Components/Converter/Makefile.am | 2 +- lib/python/Components/Makefile.am | 2 +- lib/python/Components/Renderer/Makefile.am | 2 +- lib/python/Components/Sources/Makefile.am | 2 +- lib/python/Makefile.am | 2 +- 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 +- .../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 +- lib/python/Screens/Makefile.am | 2 +- lib/python/Tools/Makefile.am | 2 +- po/Makefile.am | 4 ++-- 74 files changed, 73 insertions(+), 110 deletions(-) diff --git a/Makefile.am b/Makefile.am index fd1a7c5..813e4f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,6 @@ -AUTOMAKE_OPTIONS = gnu - 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 \ diff --git a/data/Makefile.am b/data/Makefile.am index fce28bd..3c188cb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,8 +1,4 @@ -AUTOMAKE_OPTIONS = gnu - SUBDIRS = countries fonts defaults extensions skin_default -installdir = $(DATADIR)/enigma2 - -install_DATA = \ +pkgdata_DATA = \ *.xml *.png encoding.conf radio.mvi diff --git a/data/countries/Makefile.am b/data/countries/Makefile.am index 7b2ccc0..4b02f4c 100644 --- 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 diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am index e37e095..65ce58a 100644 --- 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 \ diff --git a/data/defaults/Makefile.am b/data/defaults/Makefile.am index 054047e..a02b015 100644 --- a/data/defaults/Makefile.am +++ b/data/defaults/Makefile.am @@ -1,8 +1 @@ -AUTOMAKE_OPTIONS = gnu - 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 e1663dd..9e51087 100644 --- 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 diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am index 8f84543..67adb96 100644 --- a/data/fonts/Makefile.am +++ b/data/fonts/Makefile.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = gnu - installdir = $(FONTDIR) install_DATA = \ diff --git a/data/skin_default/Makefile.am b/data/skin_default/Makefile.am index 38102c7..ae4b42c 100644 --- a/data/skin_default/Makefile.am +++ b/data/skin_default/Makefile.am @@ -1,8 +1,6 @@ -AUTOMAKE_OPTIONS = gnu - SUBDIRS = menu icons buttons spinner -installdir = $(DATADIR)/enigma2/skin_default +installdir = $(pkgdatadir)/skin_default install_DATA = \ *.png diff --git a/data/skin_default/buttons/Makefile.am b/data/skin_default/buttons/Makefile.am index 40af022..bf68be4 100644 --- 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 diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am index 999adc5..6dfeaed 100644 --- 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 diff --git a/data/skin_default/menu/Makefile.am b/data/skin_default/menu/Makefile.am index a6476ba..e7c4d79 100644 --- 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 diff --git a/data/skin_default/spinner/Makefile.am b/data/skin_default/spinner/Makefile.am index b6cf5f2..44e3b91 100644 --- 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 diff --git a/lib/python/Components/Converter/Makefile.am b/lib/python/Components/Converter/Makefile.am index da226f8..75c8a08 100644 --- 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 \ diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am index 85e4d3e..34710fa 100755 --- 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 diff --git a/lib/python/Components/Renderer/Makefile.am b/lib/python/Components/Renderer/Makefile.am index 371c8d7..9f3b262 100644 --- 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 \ diff --git a/lib/python/Components/Sources/Makefile.am b/lib/python/Components/Sources/Makefile.am index d04013f..6ef8cac 100644 --- 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 \ diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am index 1877efc..e38f7d8 100644 --- 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 -installdir = $(LIBDIR)/enigma2/python +installdir = $(pkglibdir)/python install_PYTHON = \ enigma.py diff --git a/lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am b/lib/python/Plugins/DemoPlugins/TestPlugin/Makefile.am index 2c52330..d5ebf22 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 e8f5b4b..9f48bf3 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 7b5bef3..30b7d88 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 be89eba..9b25d9d 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 f9a3ad7..c4ba6aa 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 45c410f..1f82437 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 6d2e2ec..a9a8815 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 0a792e7..029b738 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 e3905e1..5fb8eca 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 d0b8258..a2b5841 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 0d1f4a6..ddaf228 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 123df22..1a3bc3e 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 23d591a..29a07d0 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 d304373..3b9f446 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 959a1bf..ab4bd3b 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 3fc6105..852c935 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 61d5b3d..ffb2921 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 15b5fa0..a287620 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 a06416a..59a9a3c 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 660a8df..21cd6e1 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 ce4d432..52f9fe7 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 78595de..d1da4cd 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 8356154..9f6ce78 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 8adb1b6..d001a1f 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 1c18adb..f043503 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 562b149..29027b5 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 f192c23..df120e9 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 23d14da..bab60c4 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 080a35f..92e70f3 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 1d3b2f9..eeb3a3a 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 c1d432f..17a5721 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 cd72696..212fad4 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 9d7cc66..ff50839 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 514b62b..ea9b605 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 8a976ad..780a2f4 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 fa70242..5966e53 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 6bba92b..c7b7de8 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 cbb6957..c93d714 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 d188ac7..ae8472f 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 962ff48..a4ef378 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 0546ca7..ae91040 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 2efe584..7d45e83 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 3f2dbd7..36c6412 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 bbec995..35162a4 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 cedad9b..edf4150 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 a6370cd..770c088 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 3a363fb..5c0e978 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 5c7f4bb..fcff8c4 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 f94498f..32a07da 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 bf1d349..a15a633 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 b4fe1d5..a682c51 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 cdbcee1..9f11433 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 4c1b7d6..331a1ff 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 190dd9d..235e3b5 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 diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am index ca67f73..44994b8 100755 --- 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 \ diff --git a/lib/python/Tools/Makefile.am b/lib/python/Tools/Makefile.am index e7904d6..aeeb954 100644 --- 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 \ diff --git a/po/Makefile.am b/po/Makefile.am index 2e9b9c9..6f0010e 100755 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -52,6 +52,6 @@ clean-local: 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 -- 2.7.4