From 01e937bc69941fbe1cd289734fe7a718c4bc8174 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 13 Nov 2004 13:36:53 +0000
Subject: [PATCH] Fix DJGPP configury due to some bitrot:

	* config/djgpp/fnchange.lst: Group renames for opcode directory
	together.

	* config/djgpp/djconfig.sh: Replace file names that don't exist
	anymore with existing files, for checking the unpacked
	distribution.

	* config/djgpp/config.sed (am_cv_exeext, lt_cv_sys_max_cmd_len):
	Export pre-cooked values in configure-* targets that begin with
	"@test -f stage_last".
---
 gdb/ChangeLog                 | 13 +++++++++++++
 gdb/config/djgpp/config.sed   |  3 ++-
 gdb/config/djgpp/djconfig.sh  | 15 ++++++++++-----
 gdb/config/djgpp/fnchange.lst | 14 +++++++-------
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5bb6c6d0732..a5593b1d197 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2004-11-13  Eli Zaretskii  <eliz@gnu.org>
+
+	* config/djgpp/fnchange.lst: Group renames for opcode directory
+	together.
+
+	* config/djgpp/djconfig.sh: Replace file names that don't exist
+	anymore with existing files, for checking the unpacked
+	distribution.
+
+	* config/djgpp/config.sed (am_cv_exeext, lt_cv_sys_max_cmd_len):
+	Export pre-cooked values in configure-* targets that begin with
+	"@test -f stage_last".
+
 2004-11-12  Andrew Cagney  <cagney@gnu.org>
 
 	* defs.h (enum lval_type): Delete lval_reg_frame_relative.
diff --git a/gdb/config/djgpp/config.sed b/gdb/config/djgpp/config.sed
index 4313bfb0c0c..7ca2095a65f 100644
--- a/gdb/config/djgpp/config.sed
+++ b/gdb/config/djgpp/config.sed
@@ -22,7 +22,8 @@ s|\.gdbinit|gdb.ini|g
 
 /^ac_given_srcdir=/,/^CEOF/ {
   /^s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%/a\
-  /@test ! -f /s,\\(.\\)\$, export am_cv_exeext=.exe; export lt_cv_sys_max_cmd_len=12288; \\1,
+  /@test ! -f /s,\\(.\\)\$, export am_cv_exeext=.exe; export lt_cv_sys_max_cmd_len=12288; \\1,\
+  /@test -f stage_last /s,\\(.\\)\$, export am_cv_exeext=.exe; export lt_cv_sys_max_cmd_len=12288; \\1,
 
 }
 
diff --git a/gdb/config/djgpp/djconfig.sh b/gdb/config/djgpp/djconfig.sh
index c79dbfb4e13..e49c61d8d4a 100644
--- a/gdb/config/djgpp/djconfig.sh
+++ b/gdb/config/djgpp/djconfig.sh
@@ -51,17 +51,22 @@ fi
 
 # Make sure they don't have some file names mangled by untarring.
 echo -n "Checking the unpacked distribution..."
-if ( ! test -f ${srcdir}/intl/po2tblsed.in || \
-     ! test -f ${srcdir}/gdb/ChangeLog.002 || \
+if ( ! test -f ${srcdir}/bfd/ChangeLog.0203      || \
+     ! test -f ${srcdir}/gdb/ChangeLog.002       || \
+     ! test -f ${srcdir}/opcodes/ChangeLog.0203  || \
      ! test -f ${srcdir}/readline/config.h-in ) ; then
-  if ( ! test -f ${srcdir}/intl/po2tblsed.in ) ; then
-    notfound=${srcdir}/intl/po2tblsed.in
+  if ( ! test -f ${srcdir}/bfd/ChangeLog.0203 ) ; then
+    notfound=${srcdir}/bfd/ChangeLog.0203
   else
-    if ( ! test -d ${srcdir}/gdb/testsuite/cxx) ; then
+    if ( ! test -f ${srcdir}/gdb/ChangeLog.002) ; then
       notfound=${srcdir}/gdb/ChangeLog.002
     else
       if ( ! test -f ${srcdir}/readline/config.h-in ) ; then
         notfound=${srcdir}/readline/config.h-in
+      else
+        if ( ! test -f ${srcdir}/opcodes/ChangeLog.0203 ) ; then
+          notfound=${srcdir}/opcodes/ChangeLog.0203
+        fi
       fi
     fi
   fi
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index a63c9d6b0a2..bccfa0a99ba 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -282,6 +282,13 @@
 @V@/opcodes/openrisc-opc.c @V@/opcodes/orisc-opc.c
 @V@/opcodes/openrisc-opc.h @V@/opcodes/orisc-opc.h
 @V@/opcodes/openrisc-desc.h @V@/opcodes/orisc-desc.h
+@V@/opcodes/xstormy16-asm.c @V@/opcodes/xst16asm.c
+@V@/opcodes/xstormy16-desc.c @V@/opcodes/xst16dsc.c
+@V@/opcodes/xstormy16-desc.h @V@/opcodes/xst16dsc.h
+@V@/opcodes/xstormy16-dis.c @V@/opcodes/xst16dis.c
+@V@/opcodes/xstormy16-ibld.c @V@/opcodes/xst16ibd.c
+@V@/opcodes/xstormy16-opc.c @V@/opcodes/xst16opc.c
+@V@/opcodes/xstormy16-opc.h @V@/opcodes/xst16opc.h
 @V@/readline/config.h.bot @V@/readline/config.h-bot
 @V@/readline/config.h.in @V@/readline/config.h-in
 @V@/sim/frv/profile-fr400.c @V@/sim/frv/fr400-profile.c
@@ -390,10 +397,3 @@
 @V@/tk/unix/tkUnixScrlbr.c @V@/tk/unix/tkScrlbr.c
 @V@/tk/unix/tkUnixSelect.c @V@/tk/unix/tkSelect.c
 @V@/tk/unix/tkUnixSend.c @V@/tk/unix/tkSend.c
-@V@/opcodes/xstormy16-asm.c @V@/opcodes/xst16asm.c
-@V@/opcodes/xstormy16-desc.c @V@/opcodes/xst16dsc.c
-@V@/opcodes/xstormy16-desc.h @V@/opcodes/xst16dsc.h
-@V@/opcodes/xstormy16-dis.c @V@/opcodes/xst16dis.c
-@V@/opcodes/xstormy16-ibld.c @V@/opcodes/xst16ibd.c
-@V@/opcodes/xstormy16-opc.c @V@/opcodes/xst16opc.c
-@V@/opcodes/xstormy16-opc.h @V@/opcodes/xst16opc.h
-- 
2.30.2