From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 13 Mar 2013 04:55:32 +0000 (-0400)
Subject: build-sys: use -f with ln -s
X-Git-Tag: v199~217
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=783162123dbac43d5b7a3fab9d4f11dcf86d06e1

build-sys: use -f with ln -s

Parallel builds would sometimes try to recreate the link,
and fail since 'ln -s' would refuse to overwrite.
---

diff --git a/Makefile.am b/Makefile.am
index cfcca7c88..b6d330696 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,7 +177,7 @@ define move-to-rootlibdir
 		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+		$(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
 		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
 	fi
 endef
@@ -3711,7 +3711,7 @@ man/%.html: man/%.xml man/custom-html.xsl
 	$(XSLTPROC_PROCESS_HTML)
 
 define html-alias
-	$(AM_V_LN)$(LN_S) $(notdir $<) $@
+	$(AM_V_LN)$(LN_S) -f $(notdir $<) $@
 endef
 
 endif