[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101535: Fix the MSDOS build (broken
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101535: Fix the MSDOS build (broken by revno 101511). |
Date: |
Wed, 22 Sep 2010 11:45:26 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101535
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2010-09-22 11:45:26 +0200
message:
Fix the MSDOS build (broken by revno 101511).
sed1v2.inp (LINKER): Don't edit, variable was removed from src/Makefile.in.
(LD_FIRSTFLAG): Edit to empty.
modified:
msdos/ChangeLog
msdos/sed1v2.inp
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2010-09-17 12:44:56 +0000
+++ b/msdos/ChangeLog 2010-09-22 09:45:26 +0000
@@ -1,3 +1,9 @@
+2010-09-22 Eli Zaretskii <address@hidden>
+
+ * sed1v2.inp (LINKER): Don't edit, variable was removed from
+ src/Makefile.in.
+ (LD_FIRSTFLAG): Edit to empty.
+
2010-09-17 Eli Zaretskii <address@hidden>
* sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty.
=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp 2010-09-17 12:44:56 +0000
+++ b/msdos/sed1v2.inp 2010-09-22 09:45:26 +0000
@@ -31,6 +31,7 @@
/^ALL_CFLAGS *=/s/@address@hidden@//g
/^CPPFLAGS *=/s/@address@hidden@//
/^LDFLAGS *=/s/@address@hidden@//
+/^LD_FIRSTFLAG *=/s/@address@hidden@//
/^LIBS *=/s/@address@hidden@//
/^LIBES *=/,/^ *$/ {
s/@address@hidden@//g
@@ -51,7 +52,6 @@
/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/
/^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
/^LIB_GCC *=/s/@LIB_GCC@//
-/^LD *=/s/@LINKER@/$(CC)/
/^LIB_STANDARD *=/s/@LIB_STANDARD@//
/^LIB_MATH *=/s/@LIB_MATH@/-lm/
/^LIBTIFF *=/s/@LIBTIFF@//
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101535: Fix the MSDOS build (broken by revno 101511).,
Eli Zaretskii <=