- data/config: remove some hardcoded paths

Conflicts:
	data/config/settingsupdate.conf.in

Signed-off-by: Thilo Graf <dbt@novatux.de>

Files adapted because of different configurations.

configure.ac

@@ -472,6 +472,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

data/config/Makefile.am

@@ -1,3 +1,7 @@
+EXTRA_DIST = \
+	settingsupdate.conf settingsupdate.conf.in \
+	tobackup.conf tobackup.conf.in
+
 installdir = $(CONFIGDIR)
 
 install_DATA = \

data/config/settingsupdate.conf.in

@@ -25,30 +25,34 @@
 ## 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
 #---------------------------------------------------------------------------
 
 
 #-------------
 ## Sicherungen
 #-------------
+@CONFIGDIR@/
+
+/etc/exports
 /etc/hostname
 /etc/hosts
-/etc/network
+/etc/passwd
 /etc/resolv.conf
 /etc/wpa_supplicant.conf
-/var/etc
-/var/tuxbox/config
+
+
+## Persönliche Sicherungen
 
 
 #----------------------------------------------------------------------------------------
 ## von der Sicherung auszuschließende Dateien, gekennzeichnet durch ein vorangestelltes -
 #----------------------------------------------------------------------------------------
 -/var/etc/update.urls
--/var/tuxbox/config/cables.xml
--/var/tuxbox/config/encoding.conf
--/var/tuxbox/config/providermap.xml
--/var/tuxbox/config/radio-stations.xml
--/var/tuxbox/config/satellites.xml
--/var/tuxbox/config/settingsupdate.conf
--/var/tuxbox/config/tobackup.conf
+-@CONFIGDIR@/cables.xml
+-@CONFIGDIR@/encoding.conf
+-@CONFIGDIR@/providermap.xml
+-@CONFIGDIR@/radio-stations.xml
+-@CONFIGDIR@/satellites.xml
+-@CONFIGDIR@/settingsupdate.conf
+-@CONFIGDIR@/tobackup.conf