From ed2ce51fc8c231bc474d1012cc18b700ad6c6c58 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 23 Nov 2020 23:58:02 +0100
Subject: [PATCH] data/config: remove some hardcoded paths

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/53498039d4abb0bd87396df019bd362eb64fea37
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-11-23 (Mon, 23 Nov 2020)

Origin message was:
------------------
- data/config: remove some hardcoded paths

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

------------------
This commit was generated by Migit
---
 configure.ac                                  |  6 +++
 data/config/Makefile.am                       |  4 ++
 ...ingsupdate.conf => settingsupdate.conf.in} | 38 ++++++++++---------
 .../{tobackup.conf => tobackup.conf.in}       |  0
 4 files changed, 30 insertions(+), 18 deletions(-)
 rename data/config/{settingsupdate.conf => settingsupdate.conf.in} (69%)
 rename data/config/{tobackup.conf => tobackup.conf.in} (100%)

diff --git a/configure.ac b/configure.ac
index 2129de31f..8f04082ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -473,6 +473,12 @@ AC_CONFIG_FILES([
 src/nhttpd/nhttpd.conf
 ])
 
+# Backup configs
+AC_CONFIG_FILES([
+data/config/settingsupdate.conf
+data/config/tobackup.conf
+])
+
 # Themes
 AC_CONFIG_FILES([
 data/themes/Material_Blue-Grey.theme
diff --git a/data/config/Makefile.am b/data/config/Makefile.am
index 21f47ed77..9940acc82 100644
--- a/data/config/Makefile.am
+++ b/data/config/Makefile.am
@@ -1,3 +1,7 @@
+EXTRA_DIST = \
+	settingsupdate.conf settingsupdate.conf.in \
+	tobackup.conf tobackup.conf.in
+
 installdir = $(CONFIGDIR)
 
 install_DATA = \
diff --git a/data/config/settingsupdate.conf b/data/config/settingsupdate.conf.in
similarity index 69%
rename from data/config/settingsupdate.conf
rename to data/config/settingsupdate.conf.in
index 84a91d2d2..a6ed452a0 100644
--- a/data/config/settingsupdate.conf
+++ b/data/config/settingsupdate.conf.in
@@ -25,34 +25,36 @@
 ## vor der Sicherung aus dem neuen Image zu löschende Dateien/Verzeichnisse,
 ## gekennzeichnet durch ein vorangestelltes ~
 # z.B.
-# ~/share/tuxbox/neutrino/themes/Classic.theme
+# ~@THEMESDIR@/Classic.theme
 #---------------------------------------------------------------------------
 
 
 #-------------------------
 ## NI Standard-Sicherungen
 #-------------------------
-/var/tuxbox/config/tobackup.conf
-/var/tuxbox/config/settingsupdate.conf
+@CONFIGDIR@/tobackup.conf
+@CONFIGDIR@/settingsupdate.conf
+
+@CONFIGDIR@/cables.xml
+@CONFIGDIR@/FritzCallMonitor.addr
+@CONFIGDIR@/FritzCallMonitor.cfg
+@CONFIGDIR@/radio-favorites.xml
+@CONFIGDIR@/radio-stations.xml
+@CONFIGDIR@/timerd.conf
+@CONFIGDIR@/satellites.xml
+@CONFIGDIR@/tuxcal/
+@CONFIGDIR@/tuxmail/
+@CONFIGDIR@/zapit/
+@CONFIGDIR@/oscam.*
+@CONFIGDIR@/oscammon.conf
+@CONFIGDIR@/scan.conf
+@CONFIGDIR@/srv.conf
+@CONFIGDIR@/flex/flex_eigene_scripte.conf
 
-/var/tuxbox/config/cables.xml
-/var/tuxbox/config/FritzCallMonitor.addr
-/var/tuxbox/config/FritzCallMonitor.cfg
-/var/tuxbox/config/radio-favorites.xml
-/var/tuxbox/config/radio-stations.xml
-/var/tuxbox/config/timerd.conf
-/var/tuxbox/config/satellites.xml
-/var/tuxbox/config/tuxcal/
-/var/tuxbox/config/tuxmail/
-/var/tuxbox/config/zapit/
-/var/tuxbox/config/oscam.*
-/var/tuxbox/config/oscammon.conf
-/var/tuxbox/config/scan.conf
-/var/tuxbox/config/srv.conf
-/var/tuxbox/config/flex/flex_eigene_scripte.conf
 /var/bin/
 /var/etc/
 /var/keys/
+
 /etc/exports
 /etc/hostname
 /etc/hosts
diff --git a/data/config/tobackup.conf b/data/config/tobackup.conf.in
similarity index 100%
rename from data/config/tobackup.conf
rename to data/config/tobackup.conf.in