diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 17:57:35 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 17:57:35 +0200 |
| commit | 9d9d12cdf35151946d2429845a72149c5a7309e4 (patch) | |
| tree | 9c8d43067efc1129d682005ad923e014b882c98f /msdos/sed1v2.inp | |
| parent | 56e96bed349771df1df56546450a21afc75c00d3 (diff) | |
| download | emacs-9d9d12cdf35151946d2429845a72149c5a7309e4.tar.gz | |
Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
src/s/msdos.h (strtold): Define to _strtold.
admin/admin.el (set-version): Add msdos/sed2v2.inp.
Diffstat (limited to 'msdos/sed1v2.inp')
| -rw-r--r-- | msdos/sed1v2.inp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 1cfd4f803c2..49e45b5e0d8 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -98,6 +98,7 @@ s/\.h\.in/.h-in/ /^ns_appbindir *=/s/@ns_appbindir@// /^ns_appsrc *=/s/@ns_appsrc@// /^NS_OBJ *=/s/@NS_OBJ@// +/^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// /^NS_SUPPORT *=/s/@NS_SUPPORT@// /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^LIBRESOLV *=/s/@LIBRESOLV@// @@ -145,6 +146,11 @@ s/\.h\.in/.h-in/ stubedit emacs.exe minstack=2048k s/ || exit 1\; \\$// s/ || true\; \\$// +s/ @true *$/ @rem/ +s/^ [^ ]*move-if-change /update / +/^ echo[ ][ ]*timestamp/s/echo /djecho / +/^ cd \$(lib) && \$(MAKE)/c\ + $(MAKE) $(MFLAGS) -C $(lib) libgnu.a /^RUN_TEMACS *=/s|`/bin/pwd`|.| /^ *@\$(MKDEPDIR) *$/d /^ mv \.\/\.gdbinit/d |