diff options
| author | Robert James Kaes <rjkaes@users.sourceforge.net> | 2002-05-10 19:53:03 +0000 |
|---|---|---|
| committer | Robert James Kaes <rjkaes@users.sourceforge.net> | 2002-05-10 19:53:03 +0000 |
| commit | f0b09906127b44b87c793a92aadd5dc41ac8e906 (patch) | |
| tree | e18030ec2827f29c7cc4fe47f15a8dcda62508ac | |
| parent | 8e9fee2e10d98a9b84d7d1feb45908dd3084fb83 (diff) | |
| download | tinyproxy-f0b09906127b44b87c793a92aadd5dc41ac8e906.tar.gz tinyproxy-f0b09906127b44b87c793a92aadd5dc41ac8e906.zip | |
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.)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -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:" |