summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a32d30..dbf5dbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/Makefile.am b/Makefile.am
index 62453c5..b7c3a5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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:"