Commit 784fe52e authored by brendan's avatar brendan

Whoops! make install could overwrite an existing icecast.xml.

Install icecast.xml.dist in doc
Install as $(sysconfdir)/icecast.xml only if that file doesn't already
exist.

svn path=/trunk/icecast/; revision=4983
parent ea2dc4a6
...@@ -4,14 +4,20 @@ AUTOMAKE_OPTIONS = foreign ...@@ -4,14 +4,20 @@ AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = icecast.xml.in EXTRA_DIST = icecast.xml.in
sysconf_DATA = icecast.xml docdir = $(datadir)/$(PACKAGE)/doc
doc_DATA = icecast.xml.dist
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
test -f $(DESTDIR)$(sysconfdir)/icecast.xml || \
$(INSTALL_DATA) icecast.xml.dist $(DESTDIR)$(sysconfdir)/icecast.xml
edit = sed -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ edit = sed -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-e 's,@localstatedir\@,$(localstatedir),g' \ -e 's,@localstatedir\@,$(localstatedir),g' \
-e 's,@PACKAGE\@,$(PACKAGE),g' -e 's,@PACKAGE\@,$(PACKAGE),g'
icecast.xml: $(srcdir)/icecast.xml.in icecast.xml.dist: $(srcdir)/icecast.xml.in
$(edit) $(srcdir)/icecast.xml.in > icecast.xml $(edit) $(srcdir)/icecast.xml.in > icecast.xml.dist
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@" $(MAKE) all CFLAGS="@DEBUG@"
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<!-- Note that if <chroot> is turned on below, these paths must both <!-- Note that if <chroot> is turned on below, these paths must both
be relative to the new root, not the original root --> be relative to the new root, not the original root -->
<logdir>@localstatedir@/@PACKAGE@/logs</logdir> <logdir>@localstatedir@/log/@PACKAGE@</logdir>
<webroot>@pkgdatadir@/web</webroot> <webroot>@pkgdatadir@/web</webroot>
<adminroot>@pkgdatadir@/admin</adminroot> <adminroot>@pkgdatadir@/admin</adminroot>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment