aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
diff options
context:
space:
mode:
authorEli Zaretskii2011-02-26 15:38:25 +0200
committerEli Zaretskii2011-02-26 15:38:25 +0200
commitea2bc7b02fe99d10ff0606c7008e84a9afbebe20 (patch)
tree1553818e4e1eeaea6ced10827835dc665f560d12 /msdos
parent003fa8b6f4bcf38941d7e1c219d9b0eaf78a6467 (diff)
downloademacs-ea2bc7b02fe99d10ff0606c7008e84a9afbebe20.tar.gz
emacs-ea2bc7b02fe99d10ff0606c7008e84a9afbebe20.zip
Test and finish fixing the MS-DOS build.
msdos/sedlib.mk (APPLE_UNIVERSAL_BUILD): New edit. (gl_LIBOBJS): Add md5.o and filemode.o.
Diffstat (limited to 'msdos')
-rw-r--r--msdos/ChangeLog3
-rw-r--r--msdos/sedlibmk.inp5
2 files changed, 5 insertions, 3 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 0f2ce0c3e51..1891d79da43 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -18,8 +18,9 @@
18 (NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR) 18 (NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR)
19 (REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT) 19 (REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT)
20 (REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H) 20 (REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H)
21 (WCHAR_T_SUFFIX, WINT_T_SUFFIX): New edits. 21 (WCHAR_T_SUFFIX, WINT_T_SUFFIX, APPLE_UNIVERSAL_BUILD): New edits.
22 ($(MKDIR_P)): Replace with equivalent DOS command. 22 ($(MKDIR_P)): Replace with equivalent DOS command.
23 (gl_LIBOBJS): Add md5.o and filemode.o.
23 24
24 * sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T) 25 * sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
25 (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T) 26 (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T)
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index c668d73a328..b71aef985a9 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -53,7 +53,7 @@ am__cd = cd
53/^BITSIZEOF_SIZE_T *=/s/@BITSIZEOF_SIZE_T@/32/ 53/^BITSIZEOF_SIZE_T *=/s/@BITSIZEOF_SIZE_T@/32/
54/^BITSIZEOF_WCHAR_T *=/s/@BITSIZEOF_WCHAR_T@/16/ 54/^BITSIZEOF_WCHAR_T *=/s/@BITSIZEOF_WCHAR_T@/16/
55/^BITSIZEOF_WINT_T *=/s/@BITSIZEOF_WINT_T@/32/ 55/^BITSIZEOF_WINT_T *=/s/@BITSIZEOF_WINT_T@/32/
56 56/^APPLE_UNIVERSAL_BUILD *=/s/@APPLE_UNIVERSAL_BUILD@/0/
57# 57#
58# Some GNULIB_* are replaced with zero even though DJGPP does not have 58# Some GNULIB_* are replaced with zero even though DJGPP does not have
59# these features. That's because the gnulib replacements cannot 59# these features. That's because the gnulib replacements cannot
@@ -273,6 +273,7 @@ am__cd = cd
273/^REPLACE_DUP *=/s/@REPLACE_DUP@/0/ 273/^REPLACE_DUP *=/s/@REPLACE_DUP@/0/
274/^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/ 274/^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/
275/^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/ 275/^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/
276/^REPLACE_FSTAT *=/s/@REPLACE_FSTAT@/0/
276/^REPLACE_GETCWD *=/s/@REPLACE_GETCWD@/0/ 277/^REPLACE_GETCWD *=/s/@REPLACE_GETCWD@/0/
277/^REPLACE_GETDOMAINNAME *=/s/@REPLACE_GETDOMAINNAME@/0/ 278/^REPLACE_GETDOMAINNAME *=/s/@REPLACE_GETDOMAINNAME@/0/
278/^REPLACE_GETGROUPS *=/s/@REPLACE_GETGROUPS@/0/ 279/^REPLACE_GETGROUPS *=/s/@REPLACE_GETGROUPS@/0/
@@ -325,7 +326,7 @@ am__cd = cd
325/^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@[^@\n]*@/0/ 326/^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@[^@\n]*@/0/
326/^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/ 327/^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/
327/^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@// 328/^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
328/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o/ 329/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o/
329/^srcdir *=/s/@[^@\n]*@/./ 330/^srcdir *=/s/@[^@\n]*@/./
330/^top_srcdir *=/s/@[^@\n]*@/../ 331/^top_srcdir *=/s/@[^@\n]*@/../
331/^top_builddir *=/s/@[^@\n]*@/../ 332/^top_builddir *=/s/@[^@\n]*@/../