diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-07-14 13:08:14 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-07-14 13:08:14 +0300 |
| commit | 5a1131d937c324c070173482a8d7d47e3b3c79b0 (patch) | |
| tree | 570554eddbff849902f0412f94e2f99c8dc949df /msdos | |
| parent | 044080727ca76118afbd1cc35f85dbef7582030e (diff) | |
| parent | b5cf7fc45c625b312ab88fb3fa13eef2f25acbce (diff) | |
| download | emacs-5a1131d937c324c070173482a8d7d47e3b3c79b0.tar.gz | |
Adapt the MS-DOS build to the latest configury changes.
msdos/sed1v2.inp: In the recipe for $(leimdir)/leim-list.el, edit the
prerequisites to be "temacs$(EXEEXT) $(BOOTSTRAPEMACS)", to avoid
the need to rebuild $(bootstrap_exe), which requires a Unixy shell
via lisp/Makefile.in's "update-subdirs" command.
msdos/sedlibmk.inp (am_libgnu_a_OBJECTS): Adjust the removal of
careadlinkat.$(OBJEXT) to the changes in lib/Makefile.in.
msdos/sed2v2.inp (DATA_START, GC_SETJMP_WORKS, HAVE_MENUS)
(HAVE_MOUSE): Edit for DJGPP, according to what was previously
done on src/s/msdos.h.
msdos/gmalloc.c (GMALLOC_INHIBIT_VALLOC): Don't reference.
src/s/msdos.h (BSD_SYSTEM, DATA_START, GC_SETJMP_WORKS, HAVE_MOUSE)
(HAVE_MENUS): Don't define, defined by editing config.in with
msdos/sed2v2.inp.
(GMALLOC_INHIBIT_VALLOC): Don't define.
(MODE_LINE_BINARY_TEXT): Remove, not used anymore.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 14 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 4 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 4 |
4 files changed, 23 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index a9cbc50ba86..85251afef05 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,17 @@ +2012-07-14 Eli Zaretskii <eliz@gnu.org> + + * sed1v2.inp: In the recipe for $(leimdir)/leim-list.el, edit the + prerequisites to be "temacs$(EXEEXT) $(BOOTSTRAPEMACS)", to avoid + the need to rebuild $(bootstrap_exe), which requires a Unixy shell + via lisp/Makefile.in's "update-subdirs" command. + + * sedlibmk.inp (am_libgnu_a_OBJECTS): Adjust the removal of + careadlinkat.$(OBJEXT) to the changes in lib/Makefile.in. + + * sed2v2.inp (DATA_START, GC_SETJMP_WORKS, HAVE_MENUS) + (HAVE_MOUSE): Edit for DJGPP, according to what was previously + done on src/s/msdos.h. + 2012-06-30 Eli Zaretskii <eliz@gnu.org> * mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index b2ce4b327dc..7a43697a06a 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -136,11 +136,13 @@ s/\.h\.in/.h-in/ /^.\$(libsrc)\/make-doc/s!>.*$!! /^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src! /^[ ]*$/d +/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/temacs$(EXEEXT) $(BOOTSTRAPEMACS)/ /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit /^ *test "X\$(PAXCTL)" = X/d /^ *test "\$(CANNOT_DUMP)" = "yes"/d /^ if test "\$(CANNOT_DUMP)" =/,/^ else /d +/^ -\{0,1\} *ln -/s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/ /^ fi/d /^ *LC_ALL=C \$(RUN_TEMACS)/i\ stubedit temacs.exe minstack=1024k diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 853c64fb178..759418f0f15 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -54,6 +54,10 @@ /^#undef HAVE_STRUCT_TM_TM_ZONE *$/s/^.*$/#define HAVE_STRUCT_TM_TM_ZONE 1/ /^#undef HAVE_SYNC *$/s/^.*$/#define HAVE_SYNC 1/ /^#undef HAVE___BUILTIN_UNWIND_INIT *$/s/^.*$/#define HAVE___BUILTIN_UNWIND_INIT 1/ +/^#undef HAVE_MENUS *$/s/^.*$/#define HAVE_MENUS 1/ +/^#undef HAVE_MOUSE *$/s/^.*$/#define HAVE_MOUSE 1/ +/^#undef DATA_START/s/^.*$/#define DATA_START (\&etext + 1)/ +/^#undef GC_SETJMP_WORKS/s/^.*$/#define GC_SETJMP_WORKS 1/ /^#undef ORDINARY_LINK/s/^.*$/#define ORDINARY_LINK 1/ /^#undef PACKAGE_BUGREPORT/s/^.*$/#define PACKAGE_BUGREPORT ""/ /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/ diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 40b94acf107..432749af92a 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -605,7 +605,9 @@ am__cd = cd s| *sys/select\.h|| s| *sys/time\.h|| } -/^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)// +/^am_libgnu_a_OBJECTS *=/,/^[ ]/{ + s/careadlinkat\.\$(OBJEXT) // +} /^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)// /^srcdir *=/s/@[^@\n]*@/./ /^top_srcdir *=/s/@[^@\n]*@/../ |