Remove absolute path from libust.so

I noticed that the libust.so ld script is installed to the same directory as
libust.so.0 and libust-initializer.o, so removing the absolute paths from them
allows linking with a libust.so that isn't in the sysroot or installed under
/usr/, like e.g., in a DESTDIR directory.  This was useful for testing a
release with everything extracted some randome prefix, e.g., libust.so in
$RANDOM_UNPACK_DIR/usr/lib, and pointing LD_LIBRARY_PATH to
$RANDOM_UNPACK_DIR/usr/lib.

diff --git a/Makefile.am b/Makefile.am
index 93851161a9bb1464c08e224355a76a11dff2d629..3f23249060edd5b64c583817c9de238a6775f9da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ ldscripts_DATA = libust.so libust-initializer.o
 CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
 
 libust.so: libust.ldscript.in
-       $(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
+       $(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" < $< > $@
 
 # It is very important to compile the initializer with PIC otherwise we
 # may get obscure errors when linking to shared libraries.

diff --git a/libust.ldscript.in b/libust.ldscript.in
index 3babac687d75189369612af17486245af00cfa2a..d3f9fe84a9cc369fdb2bcb1d54d111bfbfac4e04 100644 (file)
--- a/libust.ldscript.in
+++ b/libust.ldscript.in
@@ -1,4 +1,4 @@
 /* GNU ld script
    Use the shared library, but the link with initializer too */
 OUTPUT_FORMAT(@FORMAT@)
-GROUP ( @PATH@/libust.so.0 @PATH@/libust-initializer.o )
+GROUP ( libust.so.0 libust-initializer.o )