diff options
| author | Andrew Cagney <cagney@redhat.com> | 2003-03-20 22:43:10 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2003-03-20 22:43:10 +0000 |
| commit | f171de814d94e72bd96c180f18e9401615e75080 (patch) | |
| tree | 369bd73f7e036f367addc1091608710b840c1f7b | |
| parent | 86827db4036abbf910f2a0f3cc215e9708f439d0 (diff) | |
| download | gdb-f171de814d94e72bd96c180f18e9401615e75080.tar.gz | |
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.
| -rw-r--r-- | gdb/ChangeLog | 3 | ||||
| -rw-r--r-- | gdb/Makefile.in | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0d3ba3f5150..9606f6e2166 100644 --- 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 23c368ea706..43f90cda0ca 100644 --- 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 |