diff options
| author | Glenn Morris | 2010-05-20 17:48:14 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-20 17:48:14 -0700 |
| commit | 66dbf213eabcba05f54ff85e79ae44bbbeae4386 (patch) | |
| tree | 0205cff46fcf6198581c5083aef6298f6d456bf3 /msdos | |
| parent | 04384b2d186ef8e3fb77f644d6621fc52b83c99a (diff) | |
| download | emacs-66dbf213eabcba05f54ff85e79ae44bbbeae4386.tar.gz emacs-66dbf213eabcba05f54ff85e79ae44bbbeae4386.zip | |
Handle some HAVE_NS Makefile conditionals with configure.
* configure.in (ns_frag): New output file.
* src/Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app):
Move these rules to ns.mk.
* ns.mk: New file. Copyright years based on date of nextstep merge.
* msdos/sed1v2.inp(@ns_frag@): Edit to nothing.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 2 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index df532f60c9a..54e9f9cbe76 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-05-21 Glenn Morris <rgm@gnu.org> | 1 | 2010-05-21 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * sed1v2.inp(@ns_frag@): Edit to nothing. | ||
| 4 | |||
| 3 | * sed1x.inp (OLDXMENU): Replace any initial value. | 5 | * sed1x.inp (OLDXMENU): Replace any initial value. |
| 4 | * sed1v2.inp (OLDXMENU): Edit to "nothing". | 6 | * sed1v2.inp (OLDXMENU): Edit to "nothing". |
| 5 | 7 | ||
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index a54e40b5c05..ca397e6b08b 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -149,6 +149,7 @@ s/\.h\.in/.h-in/ | |||
| 149 | /^[ ]touch /s/touch/djecho $@ >/ | 149 | /^[ ]touch /s/touch/djecho $@ >/ |
| 150 | s/@YMF_PASS_LDFLAGS@/flags/ | 150 | s/@YMF_PASS_LDFLAGS@/flags/ |
| 151 | s/@deps_frag@// | 151 | s/@deps_frag@// |
| 152 | s/@ns_frag@// | ||
| 152 | s/bootstrap-emacs/b-emacs/ | 153 | s/bootstrap-emacs/b-emacs/ |
| 153 | s/bootstrap-temacs/b-temacs/ | 154 | s/bootstrap-temacs/b-temacs/ |
| 154 | s/bootstrap-doc/b-doc/ | 155 | s/bootstrap-doc/b-doc/ |