summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis Merlino <regis.merlino@intel.com>2013-03-01 11:06:49 +0100
committerRegis Merlino <regis.merlino@intel.com>2013-03-01 11:08:02 +0100
commitf55a9aa45f81dd0274e4483405092516f36509be (patch)
treed6fc1cfb3fbb973352523a8ed8fe8b571310bee0
parenta41d8b48730b86273de82ce096f1c88a43669662 (diff)
downloaddleyna-server-f55a9aa45f81dd0274e4483405092516f36509be.tar.gz
[Config] Fix wrong configuration file name
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
-rw-r--r--.gitignore2
-rw-r--r--configure.ac2
-rw-r--r--lib/Makefile.am6
-rw-r--r--lib/dleyna-server-service.conf.in (renamed from lib/dleyna-server.conf.in)0
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 4b50809..10dc7b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ m4/ltversion.m4
m4/lt~obsolete.m4
server/com.intel.dleyna-server.service
-lib/dleyna-server.conf
+lib/dleyna-server-service.conf
lib/dleyna-server-1.0.pc
server/dleyna-server-service
diff --git a/configure.ac b/configure.ac
index acaaae0..c7e7925 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,7 +220,7 @@ AC_SUBST([with_log_type])
AC_CONFIG_FILES([Makefile \
lib/Makefile \
lib/dleyna-server-1.0.pc \
- lib/dleyna-server.conf \
+ lib/dleyna-server-service.conf \
server/com.intel.dleyna-server.service \
server/dleyna-server-service-1.0.pc \
server/Makefile \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6778795..fcdba64 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -51,14 +51,14 @@ MAINTAINERCLEANFILES = Makefile.in \
build-aux/missing \
build-aux/install-sh
-sysconf_DATA = dleyna-server.conf
+sysconf_DATA = dleyna-server-service.conf
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dleyna-server-1.0.pc
EXTRA_DIST = $(sysconf_DATA)
-CLEANFILES = $(pkgconfig_DATA) dleyna-server.conf
-DISTCLEANFILES = $(pkgconfig_DATA) dleyna-server.conf
+CLEANFILES = $(pkgconfig_DATA) dleyna-server-service.conf
+DISTCLEANFILES = $(pkgconfig_DATA) dleyna-server-service.conf
maintainer-clean-local:
rm -rf build-aux
diff --git a/lib/dleyna-server.conf.in b/lib/dleyna-server-service.conf.in
index 0acca2c..0acca2c 100644
--- a/lib/dleyna-server.conf.in
+++ b/lib/dleyna-server-service.conf.in