diff options
| author | Andreas Oberritter <obi@saftware.de> | 2009-08-15 16:59:30 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@saftware.de> | 2009-08-15 16:59:30 +0200 |
| commit | 93119b6552ecbfebf92d96a6aef2049b0fb1f600 (patch) | |
| tree | b145a34fa5101a69174f46ea9152e4fab2369082 /lib/python/Plugins/Extensions/PicturePlayer | |
| parent | b774bd614bde6c4fd5c55a882ac70c009c7c76ff (diff) | |
| download | enigma2-93119b6552ecbfebf92d96a6aef2049b0fb1f600.tar.gz enigma2-93119b6552ecbfebf92d96a6aef2049b0fb1f600.zip | |
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
Diffstat (limited to 'lib/python/Plugins/Extensions/PicturePlayer')
3 files changed, 3 insertions, 7 deletions
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 |