aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-05-18 19:51:51 -0700
committerGlenn Morris2010-05-18 19:51:51 -0700
commitd494e8f280d632eda3ed2feab993a97b104cd788 (patch)
tree87b8737879ca3dd9971bcaabf51b5b2688a23453
parentebbc2619f0c902a818c94ddeb46f8bbb6242303a (diff)
downloademacs-d494e8f280d632eda3ed2feab993a97b104cd788.tar.gz
emacs-d494e8f280d632eda3ed2feab993a97b104cd788.zip
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.
-rw-r--r--msdos/ChangeLog2
-rw-r--r--msdos/sed2v2.inp1
-rw-r--r--src/ChangeLog2
-rw-r--r--src/s/msdos.h2
4 files changed, 5 insertions, 2 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index cbc018dffe6..ba1495bbd08 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,7 @@
12010-05-19 Glenn Morris <rgm@gnu.org> 12010-05-19 Glenn Morris <rgm@gnu.org>
2 2
3 * sed2v2.inp (ORDINARY_LINK): Set here rather than in s/msdos.h.
4
3 * sed1v2.inp (LD): Edit to $(CC). 5 * sed1v2.inp (LD): Edit to $(CC).
4 (YMF_PASS_LDFLAGS): Edit to `flags'. 6 (YMF_PASS_LDFLAGS): Edit to `flags'.
5 7
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 @@
52/^#undef HAVE_MKSTEMP *$/s/^.*$/#define HAVE_MKSTEMP 1/ 52/^#undef HAVE_MKSTEMP *$/s/^.*$/#define HAVE_MKSTEMP 1/
53/^#undef HAVE_STRUCT_TM_TM_ZONE *$/s/^.*$/#define HAVE_STRUCT_TM_TM_ZONE 1/ 53/^#undef HAVE_STRUCT_TM_TM_ZONE *$/s/^.*$/#define HAVE_STRUCT_TM_TM_ZONE 1/
54/^#undef HAVE_SYNC *$/s/^.*$/#define HAVE_SYNC 1/ 54/^#undef HAVE_SYNC *$/s/^.*$/#define HAVE_SYNC 1/
55/^#undef ORDINARY_LINK/s/^.*$/#define ORDINARY_LINK 1/
55/^#undef PACKAGE_BUGREPORT/s/^.*$/#define PACKAGE_BUGREPORT ""/ 56/^#undef PACKAGE_BUGREPORT/s/^.*$/#define PACKAGE_BUGREPORT ""/
56/^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/ 57/^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
57/^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ 58/^#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 @@
12010-05-19 Glenn Morris <rgm@gnu.org> 12010-05-19 Glenn Morris <rgm@gnu.org>
2 2
3 * s/msdos.h (ORDINARY_LINK): Move to sed2v2.inp.
4
3 * Makefile.in (LD, YMF_PASS_LDFLAGS): Set with configure, not cpp. 5 * Makefile.in (LD, YMF_PASS_LDFLAGS): Set with configure, not cpp.
4 (GNULIB_VAR): Remove. 6 (GNULIB_VAR): Remove.
5 (LIBES): Use LIB_GCC instead of GNULIB_VAR. 7 (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 */
82 82
83#define _NAIVE_DOS_REGS 83#define _NAIVE_DOS_REGS
84 84
85#define ORDINARY_LINK
86
87/* command.com does not understand `...` so we define this. */ 85/* command.com does not understand `...` so we define this. */
88#define SEPCHAR ';' 86#define SEPCHAR ';'
89 87