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 --- 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 +--- 11 files changed, 9 insertions(+), 40 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index fce28bd0..3c188cba 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 7b2ccc03..4b02f4c6 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 e37e095d..65ce58a8 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 054047e5..a02b0153 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 e1663ddd..9e51087c 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 8f845435..67adb96e 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 38102c77..ae4b42c7 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 40af0229..bf68be42 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 999adc54..6dfeaedc 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 a6476baa..e7c4d797 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 b6cf5f2e..44e3b91b 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 -- cgit v1.2.3