diff --git a/msdos/ChangeLog b/msdos/ChangeLog index cbc018dffe6..ba1495bbd08 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,7 @@ 2010-05-19 Glenn Morris + * 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 ea3f1718646..ab088cf2724 100644 --- 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 5d1c53bf7ba..8a5d5b9fb84 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-05-19 Glenn Morris + * 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 90f630c8627..c78096c6b90 100644 --- 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 ';'