[pushed] Fix gdb/data-directory Makefile-regeneration rule

Message ID 20210605150611.2414296-1-tom@tromey.com
State New
Headers show
Series
  • [pushed] Fix gdb/data-directory Makefile-regeneration rule
Related show

Commit Message

Tom Tromey June 5, 2021, 3:06 p.m.
My recent changes to the gdb build removed a special case for
data-directory/Makefile, but neglected to update the rule in that
Makefile.  This patch fixes the error by rewriting this rule.

gdb/ChangeLog
2021-06-05  Tom Tromey  <tom@tromey.com>

	* data-directory/Makefile.in (Makefile): Rewrite.
---
 gdb/ChangeLog                  | 4 ++++
 gdb/data-directory/Makefile.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

-- 
2.26.3

Comments

Mike Frysinger via Gdb-patches June 5, 2021, 3:23 p.m. | #1
Am Samstag, 5. Juni 2021, 17:06:47 MESZ hat Tom Tromey <tom@tromey.com> Folgendes geschrieben:

> My recent changes to the gdb build removed a special case for

> data-directory/Makefile, but neglected to update the rule in that

> Makefile.  This patch fixes the error by rewriting this rule.

>

> gdb/ChangeLog

> 2021-06-05  Tom Tromey  <tom@tromey.com>

>

>     * data-directory/Makefile.in (Makefile): Rewrite.

> ---

> gdb/ChangeLog                  | 4 ++++

> gdb/data-directory/Makefile.in | 2 +-

> 2 files changed, 5 insertions(+), 1 deletion(-)

>

> diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in

> index 8b65790cdd9..e1f3cd21a6c 100644

> --- a/gdb/data-directory/Makefile.in

> +++ b/gdb/data-directory/Makefile.in

> @@ -411,7 +411,7 @@ clean-info:

> MAKEOVERRIDES=

>

> Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

> -    cd $(top_builddir) && $(MAKE) data-directory/Makefile

> +    cd .. && $(SHELL) ./config.status testsuite/Makefile


Should this really say testsuite/Makefile here?


>

> # Disable implicit make rules.

> include $(srcdir)/../disable-implicit-rules.mk

> --

> 2.26.3



Hannes
Tom Tromey June 6, 2021, 1:01 p.m. | #2
>> Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

>> -    cd $(top_builddir) && $(MAKE) data-directory/Makefile

>> +    cd .. && $(SHELL) ./config.status testsuite/Makefile


Hannes> Should this really say testsuite/Makefile here?

Yeah.  I fixed it a bit later.

Tom

Patch

diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
index 8b65790cdd9..e1f3cd21a6c 100644
--- a/gdb/data-directory/Makefile.in
+++ b/gdb/data-directory/Makefile.in
@@ -411,7 +411,7 @@  clean-info:
 MAKEOVERRIDES=
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) && $(MAKE) data-directory/Makefile
+	cd .. && $(SHELL) ./config.status testsuite/Makefile
 
 # Disable implicit make rules.
 include $(srcdir)/../disable-implicit-rules.mk