aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-10-01 21:20:29 +0200
committerEli Zaretskii2010-10-01 21:20:29 +0200
commitae9cecb95ba94bf32fc1959d1550727e8ef034ab (patch)
tree7cda9d0e3f5672622a9b50c6baccbf0dda6aaa3f
parent54cc6a8387d4d59ae7a280a7e0adb05735a4aa8c (diff)
downloademacs-ae9cecb95ba94bf32fc1959d1550727e8ef034ab.tar.gz
emacs-ae9cecb95ba94bf32fc1959d1550727e8ef034ab.zip
Fix the MSDOS build broken by 2010-09-26T15:18:47Z!larsi@gnus.org.
sed1v2.inp (LIBGNUTLS_LIBS, LIBGNUTLS_CFLAGS): 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 49d49fb2487..b52d49b4923 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
12010-10-01 Eli Zaretskii <eliz@gnu.org>
2
3 * sed1v2.inp (LIBGNUTLS_LIBS, LIBGNUTLS_CFLAGS): Edit to empty.
4
12010-09-22 Eli Zaretskii <eliz@gnu.org> 52010-09-22 Eli Zaretskii <eliz@gnu.org>
2 6
3 * sed1v2.inp (LINKER): Don't edit, variable was removed from 7 * sed1v2.inp (LINKER): Don't edit, variable was removed from
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 58201c155bf..0ea34ecffc6 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -104,6 +104,8 @@ s/\.h\.in/.h-in/
104/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// 104/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
105/^LIBRESOLV *=/s/@LIBRESOLV@// 105/^LIBRESOLV *=/s/@LIBRESOLV@//
106/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// 106/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
107/^LIBGNUTLS_LIBS *=/s/@[^@\n]*@//
108/^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@//
107/^GETLOADAVG_LIBS *=/s/@[^@\n]*@// 109/^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
108/^START_FILES *=/s/@START_FILES@// 110/^START_FILES *=/s/@START_FILES@//
109/^OTHER_FILES *=/s/@OTHER_FILES@// 111/^OTHER_FILES *=/s/@OTHER_FILES@//