* configure.ac (src/.gdbinit): Use ac_abs_top_srcdir.

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e7df2d1c0d2..65d12ddd498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 
         Make building in directories with whitespace possible.  (Bug#15675)
         * configure.ac (srcdir): Don't make it absolute - abs_srcdir exists.
+        (src/.gdbinit): Use ac_abs_top_srcdir.
         * Makefile.in (abs_srcdir): New, set by configure.
         (buildlisppath, epaths-force-w32): Use abs_srcdir.
         (install-arch-indep, install-etcdoc, install-info, install-man)
diff --git a/configure.ac b/configure.ac
index 6a2beb70703..145db6a85c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5042,9 +5042,12 @@ else
 fi
 ], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"])
 
+dnl NB we have to cheat and use the ac_... version because abs_top_srcdir
+dnl is not yet set, sigh.  Or we could use ../$srcdir/src/.gdbinit,
+dnl or a symlink?
 AC_CONFIG_COMMANDS([src/.gdbinit], [
 if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then
-  echo "source $srcdir/src/.gdbinit" > src/.gdbinit
+  echo "source $ac_abs_top_srcdir/src/.gdbinit" > src/.gdbinit
 fi
 ])