From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 21 Apr 2016 11:16:56 +0000 (+0200)
Subject: dist: ln(1) is not guaranteed to have a '-f' option
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d0062fb9b5ca643af5457a478643f6bc7656123d;p=libvirt.git

dist: ln(1) is not guaranteed to have a '-f' option

According to the autoconf manual, using '$(LN_S) -f' is not
portable; remove the target explicitly beforehand to work around
this limitation.

Adjust some slightly awkward indentation while at it.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index c639e37e3e..b71e69485f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3079,7 +3079,8 @@ if WITH_NETWORK
 	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
 	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
 	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
-	    $(LN_S) -f ../default.xml default.xml )
+	  rm -f default.xml && \
+	  $(LN_S) ../default.xml default.xml )
 endif WITH_NETWORK
 
 uninstall-local:: uninstall-init uninstall-systemd
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e963b9116f..c5a6a0de87 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -424,7 +424,8 @@ NSS_SO_VER = 1
 
 install-exec-hook:
 	( cd $(DESTDIR)$(libdir) && \
-	  $(LN_S) -f libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER) )
+	  rm -f nss_libvirt.so.$(NSS_SO_VER) && \
+	  $(LN_S) libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER) )
 
 uninstall-local:
 	-rm -f $(DESTDIR)$(libdir)/nss_libvirt.so.$(NSS_SO_VER)