diff options
| author | Eli Zaretskii | 2015-08-15 10:56:51 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-08-15 10:56:51 +0300 |
| commit | 8db2b2a7d3fc3e4475bc4137c11069a69a3234ec (patch) | |
| tree | 9c3141edc2818d2e2909f2ad89a9620a0ec45937 /make-dist | |
| parent | 8fa49a6786bd71aa91b1e82709bc1852a65c4646 (diff) | |
| download | emacs-8db2b2a7d3fc3e4475bc4137c11069a69a3234ec.tar.gz emacs-8db2b2a7d3fc3e4475bc4137c11069a69a3234ec.zip | |
Remove files used by the old MS-Windows specific build procedure
* nt/configure.bat: Remove everything except the blurb about the
new build procedure.
* make-dist: Remove references to makefile.w32-in in various
directories, and to files in nt/ that were deleted.
* etc/NEWS: Mention the fact that the files were dropped.
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 21 |
1 files changed, 8 insertions, 13 deletions
| @@ -338,7 +338,7 @@ files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \ | |||
| 338 | -o -name 'README' \)` | 338 | -o -name 'README' \)` |
| 339 | 339 | ||
| 340 | ### Don't distribute site-init.el, site-load.el, or default.el. | 340 | ### Don't distribute site-init.el, site-load.el, or default.el. |
| 341 | for file in lisp/Makefile.in lisp/makefile.w32-in $files; do | 341 | for file in lisp/Makefile.in $files; do |
| 342 | case $file in | 342 | case $file in |
| 343 | */site-init*|*/site-load*|*/default*) continue ;; | 343 | */site-init*|*/site-load*|*/default*) continue ;; |
| 344 | esac | 344 | esac |
| @@ -347,7 +347,6 @@ done | |||
| 347 | 347 | ||
| 348 | echo "Making links to 'leim' and its subdirectories" | 348 | echo "Making links to 'leim' and its subdirectories" |
| 349 | (cd leim | 349 | (cd leim |
| 350 | ln makefile.w32-in ../${tempdir}/leim | ||
| 351 | ln ChangeLog.*[0-9] README ../${tempdir}/leim | 350 | ln ChangeLog.*[0-9] README ../${tempdir}/leim |
| 352 | ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC | 351 | ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC |
| 353 | ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC | 352 | ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC |
| @@ -377,7 +376,6 @@ echo "Making links to 'src'" | |||
| 377 | ln [a-zA-Z]*.in ../${tempdir}/src | 376 | ln [a-zA-Z]*.in ../${tempdir}/src |
| 378 | ln deps.mk ../${tempdir}/src | 377 | ln deps.mk ../${tempdir}/src |
| 379 | ln README ChangeLog.*[0-9] ../${tempdir}/src | 378 | ln README ChangeLog.*[0-9] ../${tempdir}/src |
| 380 | ln makefile.w32-in ../${tempdir}/src | ||
| 381 | ln .gdbinit .dbxinit ../${tempdir}/src | 379 | ln .gdbinit .dbxinit ../${tempdir}/src |
| 382 | cd ../${tempdir}/src | 380 | cd ../${tempdir}/src |
| 383 | rm -f globals.h config.h epaths.h Makefile buildobj.h) | 381 | rm -f globals.h config.h epaths.h Makefile buildobj.h) |
| @@ -390,7 +388,7 @@ echo "Making links to 'lib'" | |||
| 390 | (snippet_h=`(cd build-aux/snippet && ls *.h)` | 388 | (snippet_h=`(cd build-aux/snippet && ls *.h)` |
| 391 | cd lib | 389 | cd lib |
| 392 | ln [a-zA-Z]*.[ch] ../${tempdir}/lib | 390 | ln [a-zA-Z]*.[ch] ../${tempdir}/lib |
| 393 | ln gnulib.mk Makefile.am Makefile.in makefile.w32-in ../${tempdir}/lib | 391 | ln gnulib.mk Makefile.am Makefile.in ../${tempdir}/lib |
| 394 | cd ../${tempdir}/lib | 392 | cd ../${tempdir}/lib |
| 395 | script='/[*]/d; s/\.in\.h$/.h/' | 393 | script='/[*]/d; s/\.in\.h$/.h/' |
| 396 | rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`) | 394 | rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`) |
| @@ -400,7 +398,6 @@ echo "Making links to 'lib-src'" | |||
| 400 | ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src | 398 | ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src |
| 401 | ln ChangeLog.*[0-9] Makefile.in README ../${tempdir}/lib-src | 399 | ln ChangeLog.*[0-9] Makefile.in README ../${tempdir}/lib-src |
| 402 | ln rcs2log ../${tempdir}/lib-src | 400 | ln rcs2log ../${tempdir}/lib-src |
| 403 | ln makefile.w32-in ../${tempdir}/lib-src | ||
| 404 | ln update-game-score.exe.manifest ../${tempdir}/lib-src) | 401 | ln update-game-score.exe.manifest ../${tempdir}/lib-src) |
| 405 | 402 | ||
| 406 | echo "Making links to 'm4'" | 403 | echo "Making links to 'm4'" |
| @@ -410,11 +407,10 @@ echo "Making links to 'm4'" | |||
| 410 | echo "Making links to 'nt'" | 407 | echo "Making links to 'nt'" |
| 411 | (cd nt | 408 | (cd nt |
| 412 | ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt | 409 | ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt |
| 413 | ln config.nt emacs-src.tags ../${tempdir}/nt | 410 | ln subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt |
| 414 | ln nmake.defs gmake.defs subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt | ||
| 415 | ln *.in gnulib.mk ../${tempdir}/nt | 411 | ln *.in gnulib.mk ../${tempdir}/nt |
| 416 | ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt | 412 | ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt |
| 417 | ln ChangeLog.*[0-9] INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) | 413 | ln ChangeLog.*[0-9] INSTALL README README.W32 ../${tempdir}/nt) |
| 418 | 414 | ||
| 419 | echo "Making links to 'nt/inc' and its subdirectories" | 415 | echo "Making links to 'nt/inc' and its subdirectories" |
| 420 | for f in `find nt/inc -type f -name '[a-z]*.h'`; do | 416 | for f in `find nt/inc -type f -name '[a-z]*.h'`; do |
| @@ -500,23 +496,22 @@ ln `find info -type f -print` ${tempdir}/info | |||
| 500 | 496 | ||
| 501 | echo "Making links to 'doc/emacs'" | 497 | echo "Making links to 'doc/emacs'" |
| 502 | (cd doc/emacs | 498 | (cd doc/emacs |
| 503 | ln *.texi *.in makefile.w32-in ChangeLog.*[0-9] ../../${tempdir}/doc/emacs) | 499 | ln *.texi *.in ChangeLog.*[0-9] ../../${tempdir}/doc/emacs) |
| 504 | 500 | ||
| 505 | echo "Making links to 'doc/misc'" | 501 | echo "Making links to 'doc/misc'" |
| 506 | (cd doc/misc | 502 | (cd doc/misc |
| 507 | ln *.texi *.tex *.in makefile.w32-in gnus-news.el ChangeLog.*[0-9] \ | 503 | ln *.texi *.tex *.in gnus-news.el ChangeLog.*[0-9] \ |
| 508 | ../../${tempdir}/doc/misc) | 504 | ../../${tempdir}/doc/misc) |
| 509 | 505 | ||
| 510 | echo "Making links to 'doc/lispref'" | 506 | echo "Making links to 'doc/lispref'" |
| 511 | (cd doc/lispref | 507 | (cd doc/lispref |
| 512 | ln *.texi *.in makefile.w32-in README ChangeLog.*[0-9] \ | 508 | ln *.texi *.in README ChangeLog.*[0-9] ../../${tempdir}/doc/lispref |
| 513 | ../../${tempdir}/doc/lispref | ||
| 514 | ln spellfile ../../${tempdir}/doc/lispref | 509 | ln spellfile ../../${tempdir}/doc/lispref |
| 515 | ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref) | 510 | ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref) |
| 516 | 511 | ||
| 517 | echo "Making links to 'doc/lispintro'" | 512 | echo "Making links to 'doc/lispintro'" |
| 518 | (cd doc/lispintro | 513 | (cd doc/lispintro |
| 519 | ln *.texi *.in makefile.w32-in *.eps *.pdf ../../${tempdir}/doc/lispintro | 514 | ln *.texi *.in *.eps *.pdf ../../${tempdir}/doc/lispintro |
| 520 | ln README ChangeLog.*[0-9] ../../${tempdir}/doc/lispintro | 515 | ln README ChangeLog.*[0-9] ../../${tempdir}/doc/lispintro |
| 521 | cd ../../${tempdir}/doc/lispintro) | 516 | cd ../../${tempdir}/doc/lispintro) |
| 522 | 517 | ||