* mpw-config.in: Don't create host.h.

	* mpw-make.in (config.h): Add in contents of ho-mpw.h.
	* config/ho-mpw.h (TRUE_FALSE_ALREADY_DEFINED, WANT_FOPEN_BIN,
	HAVE_ERRNO_H): Define.

diff --git a/gas/ChangeLog.mpw b/gas/ChangeLog.mpw
index 3228bb7..59d5f94 100644 (file)
--- a/gas/ChangeLog.mpw
+++ b/gas/ChangeLog.mpw
@@ -1,3 +1,10 @@
+Tue Sep 20 17:32:03 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+       * mpw-config.in: Don't create host.h.
+       * mpw-make.in (config.h): Add in contents of ho-mpw.h.
+       * config/ho-mpw.h (TRUE_FALSE_ALREADY_DEFINED, WANT_FOPEN_BIN,
+       HAVE_ERRNO_H): Define.
+
 Mon Sep 12 16:56:02 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * mpw-make.in (ALL_CFLAGS): Add definition of HAVE_STDARG_H,

diff --git a/gas/config/ho-mpw.h b/gas/config/ho-mpw.h
index bcdcb70..2f5cb0f 100644 (file)
--- a/gas/config/ho-mpw.h
+++ b/gas/config/ho-mpw.h
@@ -59,6 +59,8 @@ FILE *mpw_fopen();
 #define fseek mpw_fseek
 #define abort mpw_abort
 
+#define TRUE_FALSE_ALREADY_DEFINED
+
 /* <cr> is an end-of-line marker. */
 
 #define CR_EOL
@@ -72,4 +74,8 @@ FILE *mpw_fopen();
 
 #define HOST_SPECIAL_INIT(argc,argv)  mpw_special_init ((argv)[0]);
 
+#define WANT_FOPEN_BIN
+
+#define HAVE_ERRNO_H
+
 /* end of ho-mpw.h */

diff --git a/gas/mpw-config.in b/gas/mpw-config.in
index 52506b8..f36bf7c 100644 (file)
--- a/gas/mpw-config.in
+++ b/gas/mpw-config.in
@@ -1,7 +1,5 @@
 # Configuration fragment for GAS.
 
-forward-include {srcdir}config:ho-mpw.h host.h 
-
 Set target_arch `echo {target_canonical} | sed -e 's/-.*-.*//'`
 
 # (should canonicalize arch name) */

diff --git a/gas/mpw-make.in b/gas/mpw-make.in
index 185b66a..0de0208 100644 (file)
--- a/gas/mpw-make.in
+++ b/gas/mpw-make.in
@@ -73,21 +73,15 @@ as.new \Option-f\Option-f {OBJECTS} {TARG_OBJECTS} {CLIBS}
 
 "{o}"config.h \Option-f "{o}"config-stamp
 
-"{o}"config-stamp \Option-f Makefile
+"{o}"config-stamp \Option-f Makefile "{s}"config:ho-mpw.h
        Delete -i -y "{o}"config.new "{o}"config-stamp
-       echo '#ifndef GAS_VERSION'                             > "{o}"config.new
-       echo '#define TARGET_CPU       "{target_cpu}"'        >> "{o}"config.new
-       echo '#define TARGET_ALIAS     "{target_alias}"'      >> "{o}"config.new
-       echo '#define TARGET_CANONICAL "{target_canonical}"'  >> "{o}"config.new
-       echo '#define GAS_VERSION      "{VERSION}"'           >> "{o}"config.new
-#      if [ "$(defs)" != "" ]; then \
-#        for d in .. $(defs) ; do \
-#          if [ "$$d" != ".." ]; then \
-#            echo "#define $$d"                              >> "{o}"config.new ; \
-#          else true; fi; \
-#        done ; \
-#      else true; fi
-       echo '#endif /* GAS_VERSION */'                       >> "{o}"config.new
+       Echo '#ifndef GAS_VERSION'                            > "{o}"config.new
+       Echo '#define GAS_VERSION      "{VERSION}"'          >> "{o}"config.new
+       Echo '#define TARGET_CPU       "{target_cpu}"'       >> "{o}"config.new
+       Echo '#define TARGET_ALIAS     "{target_alias}"'     >> "{o}"config.new
+       Echo '#define TARGET_CANONICAL "{target_canonical}"' >> "{o}"config.new
+       Catenate "{s}"config:ho-mpw.h                        >> "{o}"config.new
+       Echo '#endif /* GAS_VERSION */'                      >> "{o}"config.new
        MoveIfChange "{o}"config.new "{o}"config.h
        Echo ' ' >"{o}"config-stamp