Fix install rule if chronyd file is busy (Juliusz Chroboczek)

diff --git a/Makefile.in b/Makefile.in
index 0a91caffd64c1661d82367b215ed6d8fdf5b8176..23cf65bf09b6b0eb83f652c4c2820606b0dd11aa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 ##################################################
 #
-# $Header: /cvs/src/chrony/Makefile.in,v 1.47 2003/04/07 21:43:54 richard Exp $
+# $Header: /cvs/src/chrony/Makefile.in,v 1.48 2003/09/19 22:48:26 richard Exp $
 #
 # =======================================================================
 #
@@ -101,6 +101,8 @@ install: chronyd chronyc
        [ -d $(DESTDIR)$(MANDIR)/man5 ] || mkdir -p $(DESTDIR)$(MANDIR)/man5
        [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8
        [ -d $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony
+       if [ -f $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd ]; then rm -f $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd ; fi
+       if [ -f $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc ]; then rm -f $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc ; fi
        cp chronyd $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd
        chmod 555 $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd
        cp chronyc $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc

diff --git a/NEWS b/NEWS
index 6903ab62e442e3ada3d2cd385d7b874d52621bcc..bece7d2c544df523a5630c59f1f2e65fc2afdab7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ New in version 1.20
 * Allow arbitrary value of HZ in Linux kernel
 * Fix for chrony.spec on SuSE (Paul Elliot)
 * Fix handling of initstepslew if no servers are listed (John Hasler)
+* Fix install rule in Makefile if chronyd is in use (Juliusz Chroboczek)
 
 New in version 1.19
 ===================

diff --git a/README b/README
index 565f954ed4aaa964d7885e013d5e5f4ad30ad945..7988fd974d67a0aa66d0ae00dab2e7a38f62f894 100644 (file)
--- a/README
+++ b/README
@@ -171,6 +171,9 @@ Stephan I. Boettcher <stephan@nevis1.columbia.edu>
 Erik Bryer <ebryer@spots.ab.ca>
     Entries in contrib directory
 
+Juliusz Chroboczek <jch@pps.jussieu.fr>
+    Fix install rule in Makefile if chronyd file is in use.
+
 Paul Elliott <pelliott@io.com>
     DNSchrony (in contrib directory), a tool for handling NTP servers
     with variable IP addresses.
@@ -239,6 +242,6 @@ sorry I can't identify all of you individually.
 Version control information
 ===========================
 
-$Header: /cvs/src/chrony/README,v 1.28 2003/09/19 22:44:06 richard Exp $
+$Header: /cvs/src/chrony/README,v 1.29 2003/09/19 22:48:26 richard Exp $
 
 vim:tw=72