aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-10-08 11:32:40 +0200
committerEli Zaretskii2012-10-08 11:32:40 +0200
commit8db5e1790b8dd515be68f65f01579ac9ddb272ba (patch)
tree1d1c9711c40131ed4d9a3f60e239889013ed487f
parent64a261b1eac2c0507b679c05711655a4a114f323 (diff)
downloademacs-8db5e1790b8dd515be68f65f01579ac9ddb272ba.tar.gz
emacs-8db5e1790b8dd515be68f65f01579ac9ddb272ba.zip
Fix the MSDOS configury due to changes in 2012-10-08T08:23:13Z!dancol@dancol.org.
msdos/sed1v2.inp (W32_LIBS, W32_OBJ): Edit to empty.
-rw-r--r--msdos/ChangeLog4
-rw-r--r--msdos/sed1v2.inp2
2 files changed, 6 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index d3d9bc657cc..4d90e8356e3 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
12012-10-08 Eli Zaretskii <eliz@gnu.org>
2
3 * sed1v2.inp (W32_LIBS, W32_OBJ): Edit to empty.
4
12012-10-04 Paul Eggert <eggert@cs.ucla.edu> 52012-10-04 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Merge from gnulib. 7 Merge from gnulib.
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index fbee1dd03f9..553d69038fe 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -128,6 +128,8 @@ s/\.h\.in/.h-in/
128/^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/ 128/^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/
129/^DEPFLAGS *=/s/@DEPFLAGS@// 129/^DEPFLAGS *=/s/@DEPFLAGS@//
130/^MKDEPDIR *=/s/@MKDEPDIR@// 130/^MKDEPDIR *=/s/@MKDEPDIR@//
131/^W32_OBJ *=/s/@W32_OBJ@//
132/^W32_LIBS *=/s/@W32_LIBS@//
131/^version *=/s/@[^@\n]*@// 133/^version *=/s/@[^@\n]*@//
132/^@SET_MAKE@$/s/@SET_MAKE@// 134/^@SET_MAKE@$/s/@SET_MAKE@//
133/^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC! 135/^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!