From: Joel Brobecker <brobecker@gnat.com>
Date: Fri, 2 Oct 2009 22:06:11 +0000 (+0000)
Subject:         PR gdb/10649
X-Git-Tag: gdb_7_0-2009-10-06-release~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ff9db15a3ec9ae75154f8b7ad8ef38cd9e41197;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index da8c965c796..9dff1a008b1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gdb/10649
+	* Makefile.in (GDB_DATADIR_PATH): Renamed to ...
+	(GDB_DATADIR): This.
+	(xml-syscall-install): Updated.
+
 2009-10-01  Joel Brobecker  <brobecker@adacore.com>
 
 	* MAINTAINERS: Move Don Lee to the correct section (Write After
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f5e1ddeff42..7d53205aeb1 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -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 ;