Remove src/s/msdos.h

* msdos/sed2v2.inp (MSDOS, DOS_NT, FLOAT_CHECK_DOMAIN)
(HAVE_INVERSE_HYPERBOLIC, DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP)
(INTERNAL_TERMINAL, NULL_DEVICE, SEPCHAR, USER_FULL_NAME)
(_setjmp, _longjmp): Move here from src/s/msdos.h.
(config_opsysfile, config_machfile): Remove.
* msdos/sed1v2.inp (M_FILE, S_FILE): Remove.
* msdos/mainmake.v2 (TAGS tags): Remove src/s/msdos.h.

* src/s/msdos.h: Remove file.
* src/conf_post.h [MSDOS]: New section, moved from s/msdos.h.
* src/Makefile.in (S_FILE): Remove.
(config_h): Remove S_FILE.

4 files changed, 24 insertions, 6 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 503c7cbf8a1..ebd4b137948 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-01  Glenn Morris  <rgm@gnu.org>
+
+	* sed2v2.inp (MSDOS, DOS_NT, FLOAT_CHECK_DOMAIN)
+	(HAVE_INVERSE_HYPERBOLIC, DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP)
+	(INTERNAL_TERMINAL, NULL_DEVICE, SEPCHAR, USER_FULL_NAME)
+	(_setjmp, _longjmp): Move here from src/s/msdos.h.
+	(config_opsysfile, config_machfile): Remove.
+	* sed1v2.inp (M_FILE, S_FILE): Remove.
+	* mainmake.v2 (TAGS tags): Remove src/s/msdos.h.
+
 2012-07-31  Glenn Morris  <rgm@gnu.org>
 
 	* sed1v2.inp (S_FILE): Update for format change.
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index e1e646a855c..3df6ca17827 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -161,8 +161,7 @@ TAGS tags:	lib-src FRC
 	cd src
 	../bin/etags --include=../lisp/TAGS \
 	 --regex='/[ 	]*DEFVAR_[A-Z_ 	(]+"\([^"]+\)"/' \
-	 $(CURDIR)/src/*.c $(CURDIR)/src/*.h \
-         $(CURDIR)/src/s/msdos.h
+	 $(CURDIR)/src/*.c $(CURDIR)/src/*.h
 	cd ..
 	./bin/etags --include=src/TAGS
 
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 1fd81ba0e4b..0ed88931691 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -128,8 +128,6 @@ s/\.h\.in/.h-in/
 /^DEPFLAGS *=/s/@DEPFLAGS@//
 /^MKDEPDIR *=/s/@MKDEPDIR@//
 /^version *=/s/@[^@\n]*@//
-/^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h!
-/^S_FILE *=/s!=!= $(srcdir)/s/msdos.h!
 /^@SET_MAKE@$/s/@SET_MAKE@//
 /^	[ 	]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!
 /^	[ 	]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 214480a27ab..c8abf36db39 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -26,7 +26,11 @@
 #define NSIG 320\
 #endif
 
+/^#undef MSDOS *$/s/^.*$/#define MSDOS/
+/^#undef DOS_NT *$/s/^.*$/#define DOS_NT/
+/^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/
 /^#undef HAVE_ALLOCA *$/s/^.*$/#define HAVE_ALLOCA 1/
+/^#undef HAVE_INVERSE_HYPERBOLIC *$/s/^.*$/#define HAVE_INVERSE_HYPERBOLIC/
 /^#undef HAVE_SETITIMER *$/s/^.*$/#define HAVE_SETITIMER 1/
 /^#undef HAVE_STRUCT_UTIMBUF *$/s/^.*$/#define HAVE_STRUCT_UTIMBUF 1/
 /^#undef LOCALTIME_CACHE *$/s/^.*$/#define LOCALTIME_CACHE 1/
@@ -80,6 +84,15 @@
 /^#undef HAVE_SIGNED_WINT_T *$/s/^.*$/#define HAVE_SIGNED_WINT_T 1/
 /^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define HAVE_UNSIGNED_LONG_LONG_INT 1/
 /^#under HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/
+/^#undef DEVICE_SEP *$/s/^.*$/#define DEVICE_SEP ':'/
+/^#undef IS_DIRECTORY_SEP *$/s/^.*$/#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\')/
+/^#undef IS_ANY_SEP *$/s/^.*$/#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))/
+/^#undef INTERNAL_TERMINAL *$/s/^.*$/#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display::co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>::se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>::AB=<BG %d>:AF=<FG %d>:op=<DefC>:"/
+/^#undef NULL_DEVICE *$/s/^.*$/#define NULL_DEVICE "nul"/
+/^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR ';'/
+/^#undef USER_FULL_NAME *$/s/^.*$/#define USER_FULL_NAME (getenv ("NAME"))/
+/^#undef _setjmp/s/^.*$/#define _setjmp setjmp/
+/^#undef _longjmp/s/^.*$/#define _longjmp longjmp/
 /^#undef inline/s/^.*$/#define inline __inline__/
 /^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/
 /^#undef restrict/s/^.*$/#define restrict __restrict/
@@ -90,8 +103,6 @@
 s/^#undef STACK_DIRECTION *$/#define STACK_DIRECTION -1/
 s/^#undef EMACS_CONFIGURATION *$/#define EMACS_CONFIGURATION "i386-pc-msdosdjgpp"/
 s/^#undef EMACS_CONFIG_OPTIONS *$/#define EMACS_CONFIG_OPTIONS "msdos"/
-s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"!
-s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"!
 s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/
 s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
 /^#undef HAVE_INTTYPES_H/c\