Mercurial > emacs
comparison make-dist @ 91015:b83d0dadb2a7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-865)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
- Remove RCS keywords
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 29 Aug 2007 05:03:40 +0000 |
parents | f55f9811f5d7 4146a20f4623 |
children | 14c4a6aac623 |
comparison
equal
deleted
inserted
replaced
91014:2392e6a45952 | 91015:b83d0dadb2a7 |
---|---|
318 src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ | 318 src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ |
319 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ | 319 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ |
320 etc etc/charsets etc/e \ | 320 etc etc/charsets etc/e \ |
321 etc/images etc/images/ezimage etc/images/gnus etc/images/gud \ | 321 etc/images etc/images/ezimage etc/images/gnus etc/images/gud \ |
322 etc/images/icons etc/images/low-color etc/images/mail \ | 322 etc/images/icons etc/images/low-color etc/images/mail \ |
323 etc/images/smilies etc/tree-widget etc/tree-widget/default \ | 323 etc/images/smilies etc/images/tree-widget \ |
324 etc/tree-widget/folder info man m4 msdos vms mac mac/inc \ | 324 etc/images/tree-widget/default etc/images/tree-widget/folder \ |
325 etc/refcards etc/tutorials info man m4 msdos vms mac mac/inc \ | |
325 mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \ | 326 mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \ |
326 mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ | 327 mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ |
327 mac/Emacs.app/Contents/Resources/English.lproj | 328 mac/Emacs.app/Contents/Resources/English.lproj |
328 do | 329 do |
329 echo " ${tempdir}/${subdir}" | 330 echo " ${tempdir}/${subdir}" |
570 ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or | 571 ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or |
571 ### tex litter. | 572 ### tex litter. |
572 ### Don't distribute gfdl.1, since no man page references it. | 573 ### Don't distribute gfdl.1, since no man page references it. |
573 (cd etc | 574 (cd etc |
574 files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ | 575 files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ |
575 | grep -v '^charsets$' | grep -v '^images$' | grep -v '^tree-widget$'` | 576 | grep -v '^charsets$' | grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$'` |
576 ln $files ../${tempdir}/etc | 577 ln $files ../${tempdir}/etc |
577 ## If we ended up with a symlink, or if we did not get anything | 578 ## If we ended up with a symlink, or if we did not get anything |
578 ## due to a cross-device symlink, copy the file. | 579 ## due to a cross-device symlink, copy the file. |
579 for file in $files; do | 580 for file in $files; do |
580 if test -f ../${tempdir}/etc/$file; then | 581 if test -f ../${tempdir}/etc/$file; then |
593 cd ../${tempdir}/etc | 594 cd ../${tempdir}/etc |
594 rm -f fns*.el gfdl.1 | 595 rm -f fns*.el gfdl.1 |
595 rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core | 596 rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core |
596 rm -f TAGS) | 597 rm -f TAGS) |
597 | 598 |
598 echo "Making links to \`etc/charsets'" | 599 for dir in etc/charsets etc/e etc/tutorials etc/refcards ; do |
599 (cd etc/charsets | 600 echo "Making links to \`${dir}'" |
600 ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/etc/charsets | 601 (cd ${dir} |
601 cd ../../${tempdir}/etc/charsets | 602 ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/${dir} |
602 rm -f *~ \#*\# *,v =* core) | 603 cd ../../${tempdir}/${dir} |
603 | 604 rm -f *~ \#*\# *,v =* core) |
604 echo "Making links to \`etc/e'" | 605 done |
605 (cd etc/e | |
606 ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/etc/e | |
607 cd ../../${tempdir}/etc/e | |
608 rm -f *~ \#*\# *,v =* core) | |
609 | 606 |
610 echo "Making links to \`etc/images'" | 607 echo "Making links to \`etc/images'" |
611 (cd etc/images | 608 (cd etc/images |
612 for img in README [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do | 609 for img in README [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do |
613 if [ -f $img ]; then | 610 if [ -f $img ]; then |
614 ln $img ../../${tempdir}/etc/images | 611 ln $img ../../${tempdir}/etc/images |
615 fi | 612 fi |
616 done) | 613 done) |
617 | 614 |
618 for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/icons \ | 615 for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/icons \ |
619 etc/images/low-color etc/images/mail etc/images/smilies \ | 616 etc/images/low-color etc/images/mail etc/images/smilies ; do |
620 etc/tree-widget/default etc/tree-widget/folder ; do | |
621 echo "Making links to \`${dir}'" | 617 echo "Making links to \`${dir}'" |
622 (cd ${dir} | 618 (cd ${dir} |
623 ln `ls -d * | grep -v CVS | grep -v RCS` ../../../${tempdir}/${dir} | 619 ln `ls -d * | grep -v CVS | grep -v RCS` ../../../${tempdir}/${dir} |
624 cd ../../../${tempdir}/${dir} | 620 cd ../../../${tempdir}/${dir} |
621 rm -f *~ \#*\# *,v =* core) | |
622 done | |
623 | |
624 for dir in etc/images/tree-widget/default etc/images/tree-widget/folder ; do | |
625 echo "Making links to \`${dir}'" | |
626 (cd ${dir} | |
627 ln `ls -d * | grep -v CVS | grep -v RCS` ../../../../${tempdir}/${dir} | |
628 cd ../../../../${tempdir}/${dir} | |
625 rm -f *~ \#*\# *,v =* core) | 629 rm -f *~ \#*\# *,v =* core) |
626 done | 630 done |
627 | 631 |
628 echo "Making links to \`info'" | 632 echo "Making links to \`info'" |
629 # Don't distribute backups or autosaves. | 633 # Don't distribute backups or autosaves. |