diff options
| author | Eli Zaretskii | 2011-10-31 19:37:39 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-10-31 19:37:39 +0200 |
| commit | 0bd3cb7b2f44639e1da2245b086cedeabbfe46cf (patch) | |
| tree | 9533c1779407e6d76d1a447e6de2522bb584788e | |
| parent | 08e1d82c8818959ce2885519fe138172e2db5bf3 (diff) | |
| download | emacs-0bd3cb7b2f44639e1da2245b086cedeabbfe46cf.tar.gz emacs-0bd3cb7b2f44639e1da2245b086cedeabbfe46cf.zip | |
Fix distribution tarball for the MS-DOS build.
make-dist (tempdir): Create `autogen'.
(msdos): Add depfiles.bat and inttypes.h.
(autogen): Put README, config.in, and Makefile.in ionto the
distribution, they are needed for the MS-DOS build.
msdos/sed3v2.inp (insrcdir): Comment out definition.
$(insrcdir): Edit into MS-DOS existence test.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | make-dist | 7 | ||||
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sed3v2.inp | 2 |
4 files changed, 20 insertions, 1 deletions
| @@ -1,3 +1,10 @@ | |||
| 1 | 2011-10-31 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * make-dist (tempdir): Create `autogen'. | ||
| 4 | (msdos): Add depfiles.bat and inttypes.h. | ||
| 5 | (autogen): Put README, config.in, and Makefile.in ionto the | ||
| 6 | distribution, they are needed for the MS-DOS build. | ||
| 7 | |||
| 1 | 2011-10-25 Nali Toja <nalitoja@gmail.com> (tiny change) | 8 | 2011-10-25 Nali Toja <nalitoja@gmail.com> (tiny change) |
| 2 | 9 | ||
| 3 | * configure.in (HAVE_GNU_MAKE): Respect MAKE env-var. (Bug#9868) | 10 | * configure.in (HAVE_GNU_MAKE): Respect MAKE env-var. (Bug#9868) |
| @@ -297,7 +297,7 @@ for subdir in site-lisp \ | |||
| 297 | nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ | 297 | nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ |
| 298 | `find etc lisp admin -type d` \ | 298 | `find etc lisp admin -type d` \ |
| 299 | doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ | 299 | doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ |
| 300 | info m4 msdos \ | 300 | info m4 msdos autogen \ |
| 301 | nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \ | 301 | nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \ |
| 302 | nextstep/Cocoa/Emacs.base/Contents \ | 302 | nextstep/Cocoa/Emacs.base/Contents \ |
| 303 | nextstep/Cocoa/Emacs.base/Contents/Resources \ | 303 | nextstep/Cocoa/Emacs.base/Contents/Resources \ |
| @@ -419,8 +419,13 @@ echo "Making links to \`nt/icons'" | |||
| 419 | echo "Making links to \`msdos'" | 419 | echo "Making links to \`msdos'" |
| 420 | (cd msdos | 420 | (cd msdos |
| 421 | ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos | 421 | ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos |
| 422 | ln depfiles.bat inttypes.h ../${tempdir}/msdos | ||
| 422 | ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos) | 423 | ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos) |
| 423 | 424 | ||
| 425 | echo "Making links to \`autogen'" | ||
| 426 | (cd autogen | ||
| 427 | ln README config.in Makefile.in ../${tempdir}/autogen) | ||
| 428 | |||
| 424 | echo "Making links to \`nextstep'" | 429 | echo "Making links to \`nextstep'" |
| 425 | (cd nextstep | 430 | (cd nextstep |
| 426 | ln ChangeLog README INSTALL ../${tempdir}/nextstep) | 431 | ln ChangeLog README INSTALL ../${tempdir}/nextstep) |
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 78ea6ebf1c5..eeb363e951f 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-10-31 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * sed3v2.inp (insrcdir): Comment out definition. | ||
| 4 | $(insrcdir): Edit into MS-DOS existence test. | ||
| 5 | |||
| 1 | 2011-09-29 Eli Zaretskii <eliz@gnu.org> | 6 | 2011-09-29 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * mainmake.v2 (boot): Condition the value on the existence of | 8 | * mainmake.v2 (boot): Condition the value on the existence of |
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 346f4e07e77..3b2065157e0 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp | |||
| @@ -49,4 +49,6 @@ s!^ \./! ! | |||
| 49 | /^UTILITIES *=/,/^$/{ | 49 | /^UTILITIES *=/,/^$/{ |
| 50 | s/movemail[^ ]* *// | 50 | s/movemail[^ ]* *// |
| 51 | } | 51 | } |
| 52 | /^insrcdir=/s/^.*$/\#&/ | ||
| 53 | /^ *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $<, | ||
| 52 | 54 | ||