Fix location of gdb macros

These files need to be put in a location that corresponds to the
location of the libraries, so we need to take the runtime-libdir
path into account.

diff --git a/configure.in b/configure.in
index 16c3ad3c95eec38610b8fd34130bca416042cece..812c3720d624398c6d249915025ecf91451c7b89 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -256,8 +256,10 @@ AC_ARG_WITH(runtime-libdir,
                            [Install runtime libraries relative to libdir])],
            [],
           [with_runtime_libdir=""])
-GLIB_RUNTIME_LIBDIR=$with_runtime_libdir
+GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
+ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
 AC_SUBST(GLIB_RUNTIME_LIBDIR)
+AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
 AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
 
 dnl Checks for programs.

diff --git a/glib/Makefile.am b/glib/Makefile.am
index d183ed5c1d3e89ec9fb6ef09b46ca44fa750c970..ad721938cb1d4bbdf68370b120c7ea216a5b9183 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -380,8 +380,8 @@ libglib-gdb.py: libglib-gdb.py.in
 
 
 install-data-hook: libglib-gdb.py
-       mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load${libdir}
-       $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load${libdir}/libglib-2.0.so.0.$(LT_CURRENT).0-gdb.py
+       mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
+       $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).0-gdb.py
 if HAVE_GLIB_RUNTIME_LIBDIR
        mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
        mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index a04a29881f995113aa7b8ddaf9fd6e0d82b3f36e..8ddf539278dc9acc98064cb2fe994fdbcdce8a79 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -274,8 +274,8 @@ uninstall-gdb:
        -rm -r $(DESTDIR)$(datadir)/gdb
 
 install-data-hook: libgobject-gdb.py
-       mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load${libdir}
-       $(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load${libdir}/libgobject-2.0.so.0.$(LT_CURRENT).0-gdb.py
+       mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
+       $(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).0-gdb.py
 if HAVE_GLIB_RUNTIME_LIBDIR
        mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
        mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)