sim: headers: use abs_srcdir to find helper scripts

Trying to run `headers` in an out-of-tree build fails atm due to the
relative srcdir paths being used in a location other than where they
were setup to be used from.  Get abs_srcdir from configure and use
that instead where applicable.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index e2259e9..df6417c 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-06  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (abs_srcdir): Declare.
+       (srcroot): Define in terms of abs_srcdir.
+       (headers): Change srcdir to abs_srcdir.
+
 2012-01-02  Joel Brobecker  <brobecker@adacore.com>
 
        * dv-sockser.h, sim-assert.h, sim-fpu.c: Reformat the copyright

diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in
index 214b658..2929b38 100644 (file)
--- a/sim/common/Makefile.in
+++ b/sim/common/Makefile.in
@@ -18,7 +18,8 @@ default: all
 
 VPATH = @srcdir@
 srcdir = @srcdir@
-srcroot = $(srcdir)/../..
+abs_srcdir = @abs_srcdir@
+srcroot = $(abs_srcdir)/../..
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -82,7 +83,7 @@ headers:
        rootme=`pwd` ; \
        cd $(srcdir) ; \
        rm -f nltvals.new ; \
-       $(SHELL) $(srcdir)/gennltvals.sh $(SHELL) $(srcroot) "$(CPP_FOR_TARGET)" > nltvals.new ; \
+       $(SHELL) $(abs_srcdir)/gennltvals.sh $(SHELL) $(srcroot) "$(CPP_FOR_TARGET)" > nltvals.new ; \
        $(SHELL) $(srcroot)/move-if-change nltvals.new nltvals.def
 
 .c.o: