From 7190b81f103941668953c41eb6f074a1d32b46a7 Mon Sep 17 00:00:00 2001 From: "J. Krieg" Date: Tue, 13 Nov 2018 20:45:06 +0100 Subject: [PATCH] webtv: create necessary data directories at build time and put sample file in it Signed-off-by: Thilo Graf --- configure.ac | 1 + data/Makefile.am | 4 ++-- data/webtv/Makefile.am | 10 +++++----- data/{ => webtv}/webtv_usr.xml | 0 4 files changed, 8 insertions(+), 7 deletions(-) rename data/{ => webtv}/webtv_usr.xml (100%) diff --git a/configure.ac b/configure.ac index afc31be91..43b873fd1 100644 --- a/configure.ac +++ b/configure.ac @@ -349,6 +349,7 @@ data/themes/Neutrino-3.0/icons/buttons/Makefile data/themes/Olive-3.0/Makefile data/themes/Olive-3.0/icons/Makefile data/themes/Olive-3.0/icons/buttons/Makefile +data/webtv/Makefile data/y-web/Makefile data/y-web/images/Makefile data/y-web/languages/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 797e664bf..fe50ca81e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -11,6 +11,7 @@ SUBDIRS = \ policy \ scripts \ themes \ + webtv \ y-web if BOXTYPE_TRIPLE @@ -30,7 +31,6 @@ config_DATA = \ settingsupdate.conf \ terrestrial.xml \ tobackup.conf \ - webradio_usr.xml \ - webtv_usr.xml + webradio_usr.xml install-data-hook: $(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit diff --git a/data/webtv/Makefile.am b/data/webtv/Makefile.am index 87442050b..9ce9504f2 100644 --- a/data/webtv/Makefile.am +++ b/data/webtv/Makefile.am @@ -1,7 +1,7 @@ -installdir = $(WEBTVDIR) +installdir = $(WEBTVDIR_VAR) install_DATA = \ - filmon.lua \ - filmon.xml \ - yt_live.lua \ - yt_live.xml + webtv_usr.xml + +install-data-hook: + $(INSTALL) -d $(DESTDIR)/$(WEBTVDIR) diff --git a/data/webtv_usr.xml b/data/webtv/webtv_usr.xml similarity index 100% rename from data/webtv_usr.xml rename to data/webtv/webtv_usr.xml