summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-13 00:55:32 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-13 00:55:45 -0400
commit783162123dbac43d5b7a3fab9d4f11dcf86d06e1 (patch)
tree4547bb18f146d270f54429eaa419e3fa73c024a7
parent3ae390ba020fd6c8bad9a6b384a6ff56c9fe5f5b (diff)
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.
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index cfcca7c88b..b6d330696a 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