Mercurial > emacs
comparison msdos/sed1v2.inp @ 109195:1bbf35fc0d68
Merge from mainline.
author | Katsumi Yamaoka <katsumi@flagship2> |
---|---|
date | Mon, 17 May 2010 12:37:57 +0000 |
parents | a53949523193 |
children | fcdc7bb97c9e |
comparison
equal
deleted
inserted
replaced
109194:e0b7f217b35a | 109195:1bbf35fc0d68 |
---|---|
50 /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// | 50 /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// |
51 /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// | 51 /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// |
52 /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// | 52 /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// |
53 /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// | 53 /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// |
54 /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@// | 54 /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@// |
55 /^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/ | |
55 /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// | 56 /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// |
56 /^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/ | 57 /^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/ |
57 /^LIB_STANDARD *=/s/@LIB_STANDARD@// | 58 /^LIB_STANDARD *=/s/@LIB_STANDARD@// |
58 /^LIB_MATH *=/s/@LIB_MATH@/-lm/ | 59 /^LIB_MATH *=/s/@LIB_MATH@/-lm/ |
59 /^LIBTIFF *=/s/@LIBTIFF@// | 60 /^LIBTIFF *=/s/@LIBTIFF@// |
81 /^LIBXMU *=/s/@LIBXMU@// | 82 /^LIBXMU *=/s/@LIBXMU@// |
82 /^LIBXSM *=/s/@LIBXSM@// | 83 /^LIBXSM *=/s/@LIBXSM@// |
83 /^LIBXTR6 *=/s/@LIBXTR6@// | 84 /^LIBXTR6 *=/s/@LIBXTR6@// |
84 /^LIBXT_OTHER *=/s/@LIBXT_OTHER@// | 85 /^LIBXT_OTHER *=/s/@LIBXT_OTHER@// |
85 /^OLDXMENU_TARGET *=/s/@OLDXMENU_TARGET@// | 86 /^OLDXMENU_TARGET *=/s/@OLDXMENU_TARGET@// |
87 /^OLDXMENU_DEPS *=/s/@OLDXMENU_DEPS@// | |
86 /^XOBJ *=/s/@XOBJ@// | 88 /^XOBJ *=/s/@XOBJ@// |
87 /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// | 89 /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// |
88 /^LIBSOUND *=/s/@LIBSOUND@// | 90 /^LIBSOUND *=/s/@LIBSOUND@// |
89 /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// | 91 /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// |
90 /^RSVG_LIBS *=/s/@RSVG_LIBS@// | 92 /^RSVG_LIBS *=/s/@RSVG_LIBS@// |
97 /^ns_appbindir *=/s/@ns_appbindir@// | 99 /^ns_appbindir *=/s/@ns_appbindir@// |
98 /^ns_appsrc *=/s/@ns_appsrc@// | 100 /^ns_appsrc *=/s/@ns_appsrc@// |
99 /^NS_OBJ *=/s/@NS_OBJ@// | 101 /^NS_OBJ *=/s/@NS_OBJ@// |
100 /^NS_SUPPORT *=/s/@NS_SUPPORT@// | 102 /^NS_SUPPORT *=/s/@NS_SUPPORT@// |
101 /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// | 103 /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// |
102 /^GNUSTEP_SYSTEM_LIBRARIES *=/s/@GNUSTEP_SYSTEM_LIBRARIES@// | |
103 /^LIBRESOLV *=/s/@LIBRESOLV@// | 104 /^LIBRESOLV *=/s/@LIBRESOLV@// |
104 /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// | 105 /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// |
105 /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// | 106 /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// |
106 /^START_FILES *=/s/@START_FILES@// | 107 /^START_FILES *=/s/@START_FILES@// |
107 /^OTHER_FILES *=/s/@OTHER_FILES@// | 108 /^OTHER_FILES *=/s/@OTHER_FILES@// |
121 /^version *=/s/@[^@\n]*@// | 122 /^version *=/s/@[^@\n]*@// |
122 /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! | 123 /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! |
123 /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! | 124 /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! |
124 /^@SET_MAKE@$/s/@SET_MAKE@// | 125 /^@SET_MAKE@$/s/@SET_MAKE@// |
125 /^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@// | 126 /^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@// |
127 /^NS_IMPL_GNUSTEP_TEMACS_LDFLAGS *=/s/@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@// | |
126 /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! | 128 /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! |
127 /^.\${libsrc}make-doc/s!>.*$!! | 129 /^.\${libsrc}make-doc/s!>.*$!! |
128 /^[ ]*$/d | 130 /^[ ]*$/d |
129 /^temacs:/s/prefix-args// | 131 /^temacs:/s/prefix-args// |
130 /^temacs:/s/stamp-oldxmenu// | 132 /^temacs:/s/stamp-oldxmenu// |