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/Extensions/PicturePlayer/Makefile.am | 2 +- lib/python/Plugins/Extensions/PicturePlayer/data/Makefile.am | 6 +----- lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'lib/python/Plugins/Extensions/PicturePlayer') 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 -- cgit v1.2.3