Minor msdos build change.

* msdos/sed2v2.inp (ORDINARY_LINK): Set here rather than in s/msdos.h.
* src/s/msdos.h (ORDINARY_LINK): Move to sed2v2.inp.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index cbc018dffe6013560146bbba46da87950dfcd693..ba1495bbd08fa0646f2a0e04fab369f0cbe714a6 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-19  Glenn Morris  <rgm@gnu.org>
 
+       * sed2v2.inp (ORDINARY_LINK): Set here rather than in s/msdos.h.
+
        * sed1v2.inp (LD): Edit to $(CC).
        (YMF_PASS_LDFLAGS): Edit to `flags'.
 

diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index ea3f1718646a1f9040966fecb6e2ff3e0fc7fe45..ab088cf2724991f62785ce3fd5ef2936185c3a9f 100644 (file)
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -52,6 +52,7 @@
 /^#undef HAVE_MKSTEMP *$/s/^.*$/#define HAVE_MKSTEMP 1/
 /^#undef HAVE_STRUCT_TM_TM_ZONE *$/s/^.*$/#define HAVE_STRUCT_TM_TM_ZONE 1/
 /^#undef HAVE_SYNC *$/s/^.*$/#define HAVE_SYNC 1/
+/^#undef ORDINARY_LINK/s/^.*$/#define ORDINARY_LINK 1/
 /^#undef PACKAGE_BUGREPORT/s/^.*$/#define PACKAGE_BUGREPORT ""/
 /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d1c53bf7ba55c076fd82a7b8f69a1de55dc89cc..8a5d5b9fb84b10caa6fd00a832f1bc9204a98610 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-19  Glenn Morris  <rgm@gnu.org>
 
+       * s/msdos.h (ORDINARY_LINK): Move to sed2v2.inp.
+
        * Makefile.in (LD, YMF_PASS_LDFLAGS): Set with configure, not cpp.
        (GNULIB_VAR): Remove.
        (LIBES): Use LIB_GCC instead of GNULIB_VAR.

diff --git a/src/s/msdos.h b/src/s/msdos.h
index 90f630c8627fb65b8f82f0f6fdfe1a38e765f94c..c78096c6b90c76dd71ff2768c1ca84bc4e9ff623 100644 (file)
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -82,8 +82,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 
 #define _NAIVE_DOS_REGS
 
-#define ORDINARY_LINK
-
 /* command.com does not understand `...` so we define this.  */
 #define SEPCHAR ';'