* mpw-config.in (archname): Compute from the config.

	(BFD_MACHINES, ARCHDEFS): Put into mk.tmp.

diff --git a/opcodes/ChangeLog.mpw b/opcodes/ChangeLog.mpw
index 89394f2d5dedb70c5b71a982603d307a619ec9a8..41c6f5de954494d8d7c0dac2d79d4c9b06798300 100644 (file)
--- a/opcodes/ChangeLog.mpw
+++ b/opcodes/ChangeLog.mpw
@@ -1,3 +1,8 @@
+Wed Jan  4 15:00:30 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+       * mpw-config.in (archname): Compute from the config.
+       (BFD_MACHINES, ARCHDEFS): Put into mk.tmp.
+
 Tue Jun  7 18:45:39 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * mpw-config.in (target_arch): Compute from canonical target.

diff --git a/opcodes/mpw-config.in b/opcodes/mpw-config.in
index 635076f22b35ce61db730e0c38044f7ff685890b..a643a27f43afab370ab1ea572b42d77b9ef019d7 100644 (file)
--- a/opcodes/mpw-config.in
+++ b/opcodes/mpw-config.in
@@ -2,20 +2,24 @@
 
 forward-include "{srcroot}"bfd:hosts:mpw.h sysdep.h
 
-Set BFD_MACHINES " "
-
 Set target_arch `echo {target_canonical} | sed -e 's/-.*-.*//'`
 
+Set archname ARCH_{target_arch}
+
 If "{target_arch}" =~ /m68k/
        Set BFD_MACHINES  '"{o}"m68k-dis.c.o'
-       Set archname ARCH_m68k
-Else If "{target_arch}" =~ /mips/
-       Set BFD_MACHINES  '"{o}"mips-dis.c.o "{o}"mips-opc.c.o'
-       Set archname ARCH_mips
 Else If "{target_arch}" =~ /powerpc/
        Set BFD_MACHINES  '"{o}"ppc-dis.c.o "{o}"ppc-opc.c.o'
-       Set archname ARCH_powerpc
+Else If "{target_arch}" =~ /mips/
+       Set BFD_MACHINES  '"{o}"mips-dis.c.o "{o}"mips-opc.c.o'
 Else If "{target_arch}" =~ /sparc/
        Set BFD_MACHINES  '"{o}"sparc-dis.c.o "{o}"sparc-opc.c.o'
-       Set archname ARCH_sparc
 End If
+
+Echo '# Start from mpw-config.in' > "{o}"mk.tmp
+
+Echo "BFD_MACHINES = " {BFD_MACHINES} >> "{o}"mk.tmp
+
+Echo "ARCHDEFS = -d" {archname} >> "{o}"mk.tmp
+
+Echo '# End from mpw-config.in' >> "{o}"mk.tmp