From 2473cfa32c36be350c9c0b9c8418d5037b4d1542 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 16 Dec 2018 01:17:01 +0100
Subject: [PATCH] data: move zapit data to new zapit subdir

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/bfb54df79c2e27a2d09811fe067b9f107ba878e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-16 (Sun, 16 Dec 2018)

Origin message was:
------------------
- data: move zapit data to new zapit subdir

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 configure.ac                    |  1 +
 data/Makefile.am                | 11 ++---------
 data/zapit/Makefile.am          |  7 +++++++
 data/{ => zapit}/myservices.xml |  0
 4 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 data/zapit/Makefile.am
 rename data/{ => zapit}/myservices.xml (100%)

diff --git a/configure.ac b/configure.ac
index 54b7fdbc4..adf0bbff1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -369,6 +369,7 @@ data/y-web/jquery/Makefile
 data/y-web/languages/Makefile
 data/y-web/scripts/Makefile
 data/y-web/styles/Makefile
+data/zapit/Makefile
 lib/Makefile
 lib/connection/Makefile
 lib/hardware/coolstream/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 9a6902f0a..67c3559c1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,8 @@ SUBDIRS = \
 	themes \
 	webradio \
 	webtv \
-	y-web
+	y-web \
+	zapit
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
@@ -30,11 +31,3 @@ config_DATA = \
 	settingsupdate.conf \
 	terrestrial.xml \
 	tobackup.conf
-
-zapitdir = $(CONFIGDIR)/zapit
-
-zapit_DATA = \
-	myservices.xml
-
-#install-data-hook:
-#	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit
diff --git a/data/zapit/Makefile.am b/data/zapit/Makefile.am
new file mode 100644
index 000000000..2990531b8
--- /dev/null
+++ b/data/zapit/Makefile.am
@@ -0,0 +1,7 @@
+installdir = $(CONFIGDIR)/zapit
+
+install_DATA = \
+	myservices.xml
+
+#install-data-hook:
+#	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit
diff --git a/data/myservices.xml b/data/zapit/myservices.xml
similarity index 100%
rename from data/myservices.xml
rename to data/zapit/myservices.xml