[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104397: Adapt MSDOS build to introdu
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104397: Adapt MSDOS build to introduction of sha1 and other latest changes. |
Date: |
Sat, 28 May 2011 13:02:50 +0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104397 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-28 13:02:50 +0300
message:
Adapt MSDOS build to introduction of sha1 and other latest changes.
msdos/sedlibmk.inp (gl_LIBOBJS): Add sha1.o.
msdos/sed1v2.inp: Edit "make-docfile -d FOO" commands to chdir back to
src/. Make editing of RUN_TEMACS commands less sensitive to
leading whitespace.
modified:
msdos/ChangeLog
msdos/sed1v2.inp
msdos/sedlibmk.inp
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2011-05-20 09:47:59 +0000
+++ b/msdos/ChangeLog 2011-05-28 10:00:09 +0000
@@ -1,3 +1,11 @@
+2011-05-28 Eli Zaretskii <address@hidden>
+
+ * sed1v2.inp: Edit "make-docfile -d FOO" commands to chdir back to
+ src/. Make editing of RUN_TEMACS commands less sensitive to
+ leading whitespace.
+
+ * sedlibmk.inp (gl_LIBOBJS): Add sha1.o.
+
2011-05-20 Eli Zaretskii <address@hidden>
* sed1v2.inp (make-docfile commands): Recognize only if the line
=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp 2011-05-20 09:47:59 +0000
+++ b/msdos/sed1v2.inp 2011-05-28 10:00:09 +0000
@@ -130,13 +130,13 @@
/^ [
]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!
/^ [
]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
/^.\$(libsrc)\/make-doc/s!>.*$!!
-/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp)!
+/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src!
/^[ ]*$/d
/^ if test -f/,/^ fi$/c\
command.com /c if exist .gdbinit rm -f _gdbinit
/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d
/^ fi/d
-/^ LC_ALL=C \$(RUN_TEMACS)/i\
+/^ *LC_ALL=C \$(RUN_TEMACS)/i\
stubedit temacs.exe minstack=1024k
/^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/
/-batch -l loadup/a\
=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp 2011-05-20 09:47:59 +0000
+++ b/msdos/sedlibmk.inp 2011-05-28 10:00:09 +0000
@@ -521,7 +521,7 @@
/^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
/am__append_1 *=.*gettext\.h/s/@address@hidden@/\#/
/am__append_2 *=.*verify\.h/s/@address@hidden@//
-/^gl_LIBOBJS *=/s/@address@hidden@/getopt.o getopt1.o strftime.o time_r.o
getloadavg.o md5.o filemode.o/
+/^gl_LIBOBJS *=/s/@address@hidden@/getopt.o getopt1.o strftime.o time_r.o
getloadavg.o md5.o filemode.o sha1.o/
/^BUILT_SOURCES *=/s/ *inttypes\.h//
/^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)//
/^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)//
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104397: Adapt MSDOS build to introduction of sha1 and other latest changes.,
Eli Zaretskii <=