PATCH: PR gdb/10649: GDB_DATADIR_PATH is used, but never defined

PATCH: PR gdb/10649: GDB_DATADIR_PATH is used, but never defined

[H.J. Lu]

Hi,

I am checking in this patch as an obvious fix.

Thanks.


H.J.
---
2009-09-16  H.J. Lu  <hongjiu.lu@intel.com>

	PR gdb/10649
	* Makefile.in (GDB_DATADIR_PATH): Renamed to ...
	(GDB_DATADIR): This.
	(xml-syscall-install): Updated.

--- ./Makefile.in.foo	2009-09-16 14:07:50.000000000 -0700
+++ ./Makefile.in	2009-09-16 14:47:17.000000000 -0700
@@ -167,7 +167,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT
 TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
 
 # Did the user give us a --with-gdb-datadir option?
-GDB_DATADIR_PATH = @GDB_DATADIR_PATH@
+GDB_DATADIR = @GDB_DATADIR@
 
 # Helper code from gnulib.
 LIBGNU = gnulib/libgnu.a
@@ -899,13 +899,13 @@ xml-syscall-copy:
 .PHONY: xml-syscall-install
 xml-syscall-install:
 	$(SHELL) $(srcdir)/../mkinstalldirs \
-		$(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \
+		$(DESTDIR)$(GDB_DATADIR)/$(XML_SYSCALLS_DIR) ; \
 	list='$(XML_SYSCALLS_FILES)' ; \
 	for file in $$list ; do \
 	  f=$(srcdir)/$(XML_SYSCALLS_DIR)/$$file ; \
 	  if test -f $$f ; then \
 	    $(INSTALL_DATA) $$f \
-	    	$(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \
+	    	$(DESTDIR)$(GDB_DATADIR)/$(XML_SYSCALLS_DIR) ; \
 	  fi ; \
 	done ;
 

Re: PATCH: PR gdb/10649: GDB_DATADIR_PATH is used, but never defined

[Doug Evans]

On Wed, Sep 16, 2009 at 2:52 PM, H.J. Lu <hongjiu.lu@intel.com> wrote:
> Hi,
>
> I am checking in this patch as an obvious fix.
>
> Thanks.
>
>
> H.J.
> ---
> 2009-09-16  H.J. Lu  <hongjiu.lu@intel.com>
>
>        PR gdb/10649
>        * Makefile.in (GDB_DATADIR_PATH): Renamed to ...
>        (GDB_DATADIR): This.
>        (xml-syscall-install): Updated.
>
> --- ./Makefile.in.foo   2009-09-16 14:07:50.000000000 -0700
> +++ ./Makefile.in       2009-09-16 14:47:17.000000000 -0700
> @@ -167,7 +167,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT
>  TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
>
>  # Did the user give us a --with-gdb-datadir option?
> -GDB_DATADIR_PATH = @GDB_DATADIR_PATH@
> +GDB_DATADIR = @GDB_DATADIR@
>
>  # Helper code from gnulib.
>  LIBGNU = gnulib/libgnu.a
> @@ -899,13 +899,13 @@ xml-syscall-copy:
>  .PHONY: xml-syscall-install
>  xml-syscall-install:
>        $(SHELL) $(srcdir)/../mkinstalldirs \
> -               $(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \
> +               $(DESTDIR)$(GDB_DATADIR)/$(XML_SYSCALLS_DIR) ; \
>        list='$(XML_SYSCALLS_FILES)' ; \
>        for file in $$list ; do \
>          f=$(srcdir)/$(XML_SYSCALLS_DIR)/$$file ; \
>          if test -f $$f ; then \
>            $(INSTALL_DATA) $$f \
> -               $(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \
> +               $(DESTDIR)$(GDB_DATADIR)/$(XML_SYSCALLS_DIR) ; \
>          fi ; \
>        done ;

Joel, I think it's critical that this goes into the release branch.

Otherwise, "make install" creates a directory called
@GDB_DATADIR_PATH@ in the install tree.

Re: PATCH: PR gdb/10649: GDB_DATADIR_PATH is used, but never defined

[Sérgio Durigan Júnior]

Hi Hui,

On Wednesday 16 September 2009, H.J. Lu wrote:
> Hi,
> 
> I am checking in this patch as an obvious fix.

Thank you very much for catching this.

-- 
Sérgio Durigan Júnior
Linux on Power Toolchain - Software Engineer
Linux Technology Center - LTC
IBM Brazil

Re: PATCH: PR gdb/10649: GDB_DATADIR_PATH is used, but never defined

[Joel Brobecker]

> >     PR gdb/10649
> >     * Makefile.in (GDB_DATADIR_PATH): Renamed to ...
> >     (GDB_DATADIR): This.
> >     (xml-syscall-install): Updated.
>
> Joel, I think it's critical that this goes into the release branch.
> 
> Otherwise, "make install" creates a directory called
> @GDB_DATADIR_PATH@ in the install tree.

Patch installed on the branch. (Doug, I trust your judgement, so if you
think a patch should be applied to the branch, please just do so and
explain why - If I happen to disagree, we it's easy to revert it).

-- 
Joel