Fixed up the installation of the tinyproxy.conf file. The file is only

installed if it doesn't already exist (rather than giving a make error.)
This commit is contained in:
Robert James Kaes 2002-05-10 19:53:03 +00:00
parent 8e9fee2e10
commit f0b0990612
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2002-05-10 Robert James Kaes <rjkaes@flarenet.com>
* Makefile.am (install-data-local): Fixed up the tinyproxy.conf
test so that the file is only installed if it doesn't already
exist.
2002-05-08 Robert James Kaes <rjkaes@flarenet.com>
* configure.ac: The --with-config option now supports absolute

View File

@ -5,8 +5,8 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)@TINYPROXY_CONFIG_DIR@
$(INSTALL) -m 600 $(srcdir)/doc/tinyproxy.conf \
$(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@-dist
test ! -f $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@ \
&& $(INSTALL) -m 600 $(srcdir)/doc/tinyproxy.conf \
test -f $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@ \
|| $(INSTALL) -m 600 $(srcdir)/doc/tinyproxy.conf \
$(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@
@echo ""
@echo "A configuration file has been copied to:"