From 9ca9f9c6f810d5caa0305455b4f61cdae7aa89f1 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 2 Nov 2012 20:11:00 +0100 Subject: [PATCH] change data/Makefile.am to ease merging Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/259533f80923fc0a0126f372f266ca1f465e3d9e Author: Stefan Seyfried Date: 2012-11-02 (Fri, 02 Nov 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am index 3ba17d519..c08900b20 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,4 +5,6 @@ SUBDIRS += lcd endif configdir = $(CONFIGDIR) -config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml terrestrial.xml +config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml + +config_DATA += terrestrial.xml