nat_extra_makefile_frag -> nat_makefile_frag

gdb/ChangeLog:
2017-05-17  Pedro Alves  <palves@redhat.com>

	* Makefile.in (nat_extra_makefile_frag): Rename to ...
	(nat_makefile_frag): ... this.  All references updated.
	* configure.ac: Likewise.
	* configure.nat: Likewise.  Enhance comments.
	* configure: Regenerate.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 980bd3f704b5003800c096cdaa97ea20a761767e..f2068d2e58741de858999725458793019a5493c6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-17  Pedro Alves  <palves@redhat.com>
+
+       * Makefile.in (nat_extra_makefile_frag): Rename to ...
+       (nat_makefile_frag): ... this.  All references updated.
+       * configure.ac: Likewise.
+       * configure.nat: Likewise.  Enhance comments.
+       * configure: Regenerate.
+
 2017-05-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * procfs.c (procfs_create_inferior): Change prototype to match

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 70d7d500d10dd464b09f970e67c26a416bba40e8..452f146bf34d4f0839437a6a1fdb884436cd7a01 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -916,7 +916,7 @@ NAT_GENERATED_FILES = @NAT_GENERATED_FILES@
 HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
 
 # Native-target dependent makefile fragment comes in here.
-@nat_extra_makefile_frag@
+@nat_makefile_frag@
 
 # End of native-target dependent variables.
 

diff --git a/gdb/configure b/gdb/configure
index 9aeef35b3c1b4854099c9168b041fd68c7e2abcd..8df81acadce932ee6be96a86006b905cfd8f072a 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -806,7 +806,7 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL'
-ac_subst_files='nat_extra_makefile_frag'
+ac_subst_files='nat_makefile_frag'
 ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
@@ -16732,7 +16732,7 @@ fi
 
 
 # Import nat definitions.
-nat_extra_makefile_frag=/dev/null
+nat_makefile_frag=/dev/null
 if test "${gdb_native}" = "yes"; then
   . ${srcdir}/configure.nat
   nativefile=$NAT_FILE

diff --git a/gdb/configure.ac b/gdb/configure.ac
index 05ea0c02d379429c7c4e3ac3c7b4546ed4373c31..fd11cf0237b137f7c9e05c5c444acacfc064ea6f 100644 (file)
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2200,7 +2200,7 @@ fi
 AC_SUBST(target_subdir)
 
 # Import nat definitions.
-nat_extra_makefile_frag=/dev/null
+nat_makefile_frag=/dev/null
 if test "${gdb_native}" = "yes"; then
   . ${srcdir}/configure.nat
   nativefile=$NAT_FILE
@@ -2214,7 +2214,7 @@ AC_SUBST(MH_CFLAGS)
 AC_SUBST(XM_CLIBS)
 AC_SUBST(NAT_GENERATED_FILES)
 AC_SUBST(HAVE_NATIVE_GCORE_HOST)
-AC_SUBST_FILE(nat_extra_makefile_frag)
+AC_SUBST_FILE(nat_makefile_frag)
 
 if test x"${gdb_osabi}" != x ; then
     AC_DEFINE_UNQUOTED(GDB_OSABI_DEFAULT, $gdb_osabi,

diff --git a/gdb/configure.nat b/gdb/configure.nat
index 4bf06c59b3067137bffbb4b82a48b70b372064cb..e6c96da4add8e8ee5f0b00ef17a5d2cb9a9a14cb 100644 (file)
--- a/gdb/configure.nat
+++ b/gdb/configure.nat
@@ -36,16 +36,17 @@
 # HAVE_NATIVE_GCORE_HOST - Whether gcore should be installed on this
 #                          native target.
 #
-# nat_extra_makefile_frag - File containing extra fragments of
-#                           Makefile that will be used by this native
-#                           target.
+# nat_makefile_frag - Name of the (optional) Makefile fragment file
+#                     required to build the native target.  The
+#                     fragment is incorporated into the Makefile that
+#                     configure constructs from Makefile.in.
 #
 # Notes:
 #
 # - To avoid shell expansion of variables, declare them with single
 #   quotes.
 #
-# - nat_extra_makefile_frag should contain the full path of the file.
+# - nat_makefile_frag must contain the full path of the file.
 
 
 # This first case is useful for filling default values for each
@@ -195,7 +196,7 @@ case ${gdb_host} in
 
                XM_CLIBS='-lshouldbeinlibc'
 
-               nat_extra_makefile_frag="${srcdir}/config/${gdb_host_cpu}/i386gnu.mn"
+               nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/i386gnu.mn"
                ;;
        esac
        ;;