[systemd-commits] Makefile.am

[Kay Sievers]

 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0ce91e4e3ba60d5c87307c1be4a3f6095790c4c2
Author: Mike Gilbert <floppym at gentoo.org>
Date:   Tue Mar 11 18:14:18 2014 -0400

    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.

diff --git a/Makefile.am b/Makefile.am
index 182eca6..bd78f44 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