From 0ce91e4e3ba60d5c87307c1be4a3f6095790c4c2 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 11 Mar 2014 18:14:18 -0400 Subject: [PATCH] build-sys: Fix move-to-rootlibdir Since we now use ln -s --relative, using this sed statement is redundant and causes broken symlinks to be installed. --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 182eca69d..bd78f444c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 -- 2.30.2