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/defaults/Dream/Makefile.am | 6 +----- data/defaults/Makefile.am | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'data/defaults') 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 -- cgit v1.2.3