2003-03-20 Andrew Cagney <cagney@redhat.com>

	* Makefile.in (init.c): Don't add $(srcdir) prefix when a file
	already has a full path.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d3ba3f5150dcfafa6f4b2beadbc718fb225ba80..9606f6e21660c4fa8d760407c0fb5ca9d034e6ea 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2003-03-20  Andrew Cagney  <cagney@redhat.com>
 
+       * Makefile.in (init.c): Don't add $(srcdir) prefix when a file
+       already has a full path.
+
        * main.c (gdb_main): Return 1.
        (captured_main): Call error to report an invalid interpreter.
 

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 23c368ea7066ce49c5373549a02de69236bed094..43f90cda0ca6c99095d61c04db2767d14b011a60 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -966,6 +966,13 @@ uninstall: force $(CONFIG_UNINSTALL)
 # everything else.  The catch is that other modules still take the
 # address of these builtin types forcing them to be variables, sigh!
 
+# NOTE: cagney/2003-03-18: The sed pattern ``s|^\([^ /]...'' is
+# anchored on the first column and excludes the ``/'' character so
+# that it doesn't add the $(srcdir) prefix to any file that already
+# has an absolute path.  It turns out that $(DEC)'s True64 make
+# automatically adds the $(srcdir) prefixes when it encounters files
+# in sub-directories such as cli/ and mi/.
+
 INIT_FILES = $(OBS) $(TSOBS) $(CONFIG_OBS) $(CONFIG_INITS)
 init.c: $(INIT_FILES)
        @echo Making init.c
@@ -985,7 +992,7 @@ init.c: $(INIT_FILES)
            -e '/[a-z0-9A-Z_]*-exp.tab.o/d' \
            -e 's/\.o/.c/' \
            -e 's,signals\.c,signals/signals\.c,' \
-           -e 's|\([^  ][^     ]*\)|$(srcdir)/\1|g' | \
+           -e 's|^\([^  /][^     ]*\)|$(srcdir)/\1|g' | \
        while read f; do grep '^_initialize_[a-z_0-9A-Z]* *(' $$f 2>/dev/null; done | \
        sed -e 's/^.*://' -e 's/^\([a-z_0-9A-Z]*\).*/\1/' | \
        ( echo _initialize_gdbtypes ; grep -v '^_initialize_gdbtypes$$' ) > init.l-tmp