Skip to content

Commit

Permalink
build-sys: Fix move-to-rootlibdir
Browse files Browse the repository at this point in the history
Since we now use ln -s --relative, using this sed statement is redundant
and causes broken symlinks to be installed.
  • Loading branch information
floppym authored and kaysievers committed Mar 11, 2014
1 parent b5d3e16 commit 0ce91e4
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,8 @@ define move-to-rootlibdir
if test "$(libdir)" != "$(rootlibdir)"; then \
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
rm -f $(DESTDIR)$(libdir)/$$libname && \
$(LN_S) --relative -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
$(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
Expand Down

0 comments on commit 0ce91e4

Please sign in to comment.