Mercurial > emacs
diff msdos/sed1v2.inp @ 109204:d1f39bab57ad
Merge from mainline.
author | Katsumi Yamaoka <katsumi@flagship2> |
---|---|
date | Wed, 26 May 2010 12:12:13 +0000 |
parents | 939ecb6ccd4d |
children | 3ff97bad1c47 |
line wrap: on
line diff
--- a/msdos/sed1v2.inp Tue May 25 11:10:15 2010 +0000 +++ b/msdos/sed1v2.inp Wed May 26 12:12:13 2010 +0000 @@ -129,8 +129,6 @@ /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// -/^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@// -/^NS_IMPL_GNUSTEP_TEMACS_LDFLAGS *=/s/@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@// /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! /^.\${libsrc}make-doc/s!>.*$!! /^[ ]*$/d @@ -149,6 +147,8 @@ s/@YMF_PASS_LDFLAGS@/flags/ s/@deps_frag@// s/@ns_frag@// +s/@PRE_EDIT_LDFLAGS@// +s/@POST_EDIT_LDFLAGS@// s/bootstrap-emacs/b-emacs/ s/bootstrap-temacs/b-temacs/ s/bootstrap-doc/b-doc/