[xiph-cvs] cvs commit: icecast/conf Makefile.am icecast.xml.in

[Brendan]

brendan     03/06/20 00:01:32

  Modified:    conf     Makefile.am icecast.xml.in
  Log:
  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.

Revision  Changes    Path
1.4       +9 -3      icecast/conf/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/conf/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -u -r1.3 -r1.4
--- Makefile.am	17 Jun 2003 21:10:56 -0000	1.3
+++ Makefile.am	20 Jun 2003 04:01:31 -0000	1.4
@@ -4,14 +4,20 @@ AUTOMAKE_OPTIONS = foreign
 
 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, at pkgdatadir\@,$(pkgdatadir),g' \
         -e 's, at localstatedir\@,$(localstatedir),g' \
         -e 's, at PACKAGE\@,$(PACKAGE),g'
 
-icecast.xml: $(srcdir)/icecast.xml.in
-	$(edit) $(srcdir)/icecast.xml.in > icecast.xml
+icecast.xml.dist: $(srcdir)/icecast.xml.in
+	$(edit) $(srcdir)/icecast.xml.in > icecast.xml.dist
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

<p><p>1.2       +1 -1      icecast/conf/icecast.xml.in

Index: icecast.xml.in
===================================================================
RCS file: /usr/local/cvsroot/icecast/conf/icecast.xml.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -u -r1.1 -r1.2
--- icecast.xml.in	17 Jun 2003 21:10:56 -0000	1.1
+++ icecast.xml.in	20 Jun 2003 04:01:31 -0000	1.2
@@ -88,7 +88,7 @@
 
         <!-- Note that if <chroot> is turned on below, these paths must both
              be relative to the new root, not the original root -->
-        <logdir>@localstatedir@/@PACKAGE@/logs</logdir>
+        <logdir>@localstatedir@/log/@PACKAGE@</logdir>
         <webroot>@pkgdatadir@/web</webroot>
         <adminroot>@pkgdatadir@/admin</adminroot>
 

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.