comparison make-dist @ 84349:786ae2b7b452

Update for new doc/ directory layout.
author Romain Francoise <romain@orebokech.com>
date Thu, 06 Sep 2007 18:41:46 +0000
parents 4146a20f4623
children 76889be19a75
comparison
equal deleted inserted replaced
84348:e6e2bf709c6a 84349:786ae2b7b452
152 152
153 echo Version numbers are $version and $shortversion 153 echo Version numbers are $version and $shortversion
154 154
155 if [ $update = yes ]; 155 if [ $update = yes ];
156 then 156 then
157 if grep -s "@set EMACSVER *${shortversion}" ./man/emacs.texi > /dev/null; then 157 if grep -s "@set EMACSVER *${shortversion}" ./doc/emacs/emacs.texi > /dev/null; then
158 true 158 true
159 else 159 else
160 echo "You must update the version number in \`./man/emacs.texi'" 160 echo "You must update the version number in \`./doc/emacs/emacs.texi'"
161 sleep 5 161 sleep 5
162 fi 162 fi
163 fi 163 fi
164 164
165 ### Make sure we don't already have a directory emacs-${version}. 165 ### Make sure we don't already have a directory emacs-${version}.
240 fi 240 fi
241 241
242 if [ $update = yes ]; 242 if [ $update = yes ];
243 then 243 then
244 echo "Updating Info files" 244 echo "Updating Info files"
245 (cd man; make -f Makefile.in srcdir=. info) 245 (cd doc/emacs; make -f Makefile.in srcdir=. info)
246 (cd lispref; make -f Makefile.in srcdir=. info) 246 (cd doc/misc; make -f Makefile.in srcdir=. info)
247 (cd lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.) 247 (cd doc/lispref; make -f Makefile.in srcdir=. info)
248 (cd doc/lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.)
248 249
249 echo "Updating finder, custom and autoload data" 250 echo "Updating finder, custom and autoload data"
250 (cd lisp; make updates EMACS="$EMACS") 251 (cd lisp; make updates EMACS="$EMACS")
251 252
252 if test -f leim/leim-list.el; then 253 if test -f leim/leim-list.el; then
310 version=${version} README > tmp.README 311 version=${version} README > tmp.README
311 mv -f tmp.README README) 312 mv -f tmp.README README)
312 313
313 314
314 echo "Creating subdirectories" 315 echo "Creating subdirectories"
315 for subdir in lisp site-lisp lispref lispintro \ 316 for subdir in lisp site-lisp \
316 leim leim/CXTERM-DIC leim/MISC-DIC \ 317 leim leim/CXTERM-DIC leim/MISC-DIC \
317 leim/SKK-DIC leim/ja-dic leim/quail \ 318 leim/SKK-DIC leim/ja-dic leim/quail \
318 src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ 319 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 \ 320 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
320 etc etc/e \ 321 etc etc/e \
321 etc/images etc/images/ezimage etc/images/gnus etc/images/gud \ 322 etc/images etc/images/ezimage etc/images/gnus etc/images/gud \
322 etc/images/icons etc/images/low-color etc/images/mail \ 323 etc/images/icons etc/images/low-color etc/images/mail \
323 etc/images/smilies etc/images/tree-widget \ 324 etc/images/smilies etc/images/tree-widget \
324 etc/images/tree-widget/default etc/images/tree-widget/folder \ 325 etc/images/tree-widget/default etc/images/tree-widget/folder \
325 etc/refcards etc/tutorials info man m4 msdos vms mac mac/inc \ 326 etc/refcards etc/tutorials info doc doc/emacs doc/misc doc/man \
327 doc/lispref doc/lispintro m4 msdos vms mac mac/inc \
326 mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \ 328 mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \
327 mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ 329 mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \
328 mac/Emacs.app/Contents/Resources/English.lproj 330 mac/Emacs.app/Contents/Resources/English.lproj
329 do 331 do
330 echo " ${tempdir}/${subdir}" 332 echo " ${tempdir}/${subdir}"
568 ln README ChangeLog ../${tempdir}/lwlib) 570 ln README ChangeLog ../${tempdir}/lwlib)
569 571
570 echo "Making links to \`etc'" 572 echo "Making links to \`etc'"
571 ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or 573 ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
572 ### tex litter. 574 ### tex litter.
573 ### Don't distribute gfdl.1, since no man page references it.
574 (cd etc 575 (cd etc
575 files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ 576 files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \
576 | grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$'` 577 | grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$'`
577 ln $files ../${tempdir}/etc 578 ln $files ../${tempdir}/etc
578 ## If we ended up with a symlink, or if we did not get anything 579 ## If we ended up with a symlink, or if we did not get anything
590 cp $file ../${tempdir}/etc 591 cp $file ../${tempdir}/etc
591 chmod a-w ../${tempdir}/etc/$file 592 chmod a-w ../${tempdir}/etc/$file
592 fi 593 fi
593 done 594 done
594 cd ../${tempdir}/etc 595 cd ../${tempdir}/etc
595 rm -f fns*.el gfdl.1 596 rm -f fns*.el
596 rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core 597 rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
597 rm -f TAGS) 598 rm -f TAGS)
598 599
599 for dir in etc/e etc/tutorials etc/refcards ; do 600 for dir in etc/e etc/tutorials etc/refcards ; do
600 echo "Making links to \`${dir}'" 601 echo "Making links to \`${dir}'"
637 cd ../${tempdir}/info 638 cd ../${tempdir}/info
638 # Avoid an error when expanding the wildcards later. 639 # Avoid an error when expanding the wildcards later.
639 ln emacs dummy~ ; ln emacs \#dummy\# 640 ln emacs dummy~ ; ln emacs \#dummy\#
640 rm -f *~ \#*\# core) 641 rm -f *~ \#*\# core)
641 642
642 echo "Making links to \`man'" 643 echo "Making links to \`doc/emacs'"
643 (cd man 644 (cd doc/emacs
644 ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man 645 ln *.texi *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/emacs
645 ln makefile.w32-in ../${tempdir}/man 646 ln makefile.w32-in ../../${tempdir}/doc/emacs
646 test -f README && ln README ../${tempdir}/man 647 test -f README && ln README ../../${tempdir}/doc/emacs
647 test -f Makefile.in && ln Makefile.in ../${tempdir}/man 648 test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/emacs
648 ln ChangeLog ../${tempdir}/man 649 ln ChangeLog ../../${tempdir}/doc/emacs
649 test -f split-man && ln split-man ../${tempdir}/man 650 cp texinfo.tex ../../${tempdir}/doc/emacs
650 cp texinfo.tex ../${tempdir}/man 651 cd ../../${tempdir}/doc/emacs
651 cd ../${tempdir}/man
652 rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail 652 rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail
653 rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux) 653 rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux)
654 654
655 echo "Making links to \`lispref'" 655 echo "Making links to \`doc/misc'"
656 (cd lispref 656 (cd doc/misc
657 ln `ls -1 *.texi` ../${tempdir}/lispref 657 ln *.texi *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/misc
658 ln *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/lispref 658 ln makefile.w32-in ../../${tempdir}/doc/misc
659 ln *.txt *.el spellfile tindex.pl ../${tempdir}/lispref 659 test -f README && ln README ../../${tempdir}/doc/misc
660 ln makefile.w32-in ../${tempdir}/lispref 660 test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/misc
661 test -f README && ln README ../${tempdir}/lispref 661 ln ChangeLog ../../${tempdir}/doc/misc
662 test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref 662 cp texinfo.tex ../../${tempdir}/doc/misc
663 ln ChangeLog ../${tempdir}/lispref 663 cd ../../${tempdir}/doc/misc
664 cd ../${tempdir}/lispref 664 rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail
665 rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux)
666
667 echo "Making links to \`doc/lispref'"
668 (cd doc/lispref
669 ln `ls -1 *.texi` ../../${tempdir}/doc/lispref
670 ln *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/lispref
671 ln *.txt *.el spellfile tindex.pl ../../${tempdir}/doc/lispref
672 ln makefile.w32-in ../../${tempdir}/doc/lispref
673 test -f README && ln README ../../${tempdir}/doc/lispref
674 test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/lispref
675 ln ChangeLog ../../${tempdir}/doc/lispref
676 cd ../../${tempdir}/doc/lispref
665 rm -f \#*\# =* *~ core elisp-index* *.Z *.z xmail 677 rm -f \#*\# =* *~ core elisp-index* *.Z *.z xmail
666 rm -f elisp.?? *.log *.toc *.dvi *.oaux) 678 rm -f elisp.?? *.log *.toc *.dvi *.oaux)
667 679
668 echo "Making links to \`lispintro'" 680 echo "Making links to \`doc/lispintro'"
669 (cd lispintro 681 (cd doc/lispintro
670 ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../${tempdir}/lispintro 682 ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../../${tempdir}/doc/lispintro
671 ln makefile.w32-in ../${tempdir}/lispintro 683 ln makefile.w32-in ../../${tempdir}/doc/lispintro
672 test -f texinfo.tex && ln texinfo.tex ../${tempdir}/lispintro 684 test -f texinfo.tex && ln texinfo.tex ../../${tempdir}/doc/lispintro
673 test -f README && ln README ../${tempdir}/lispintro 685 test -f README && ln README ../../${tempdir}/doc/lispintro
674 test -f Makefile.in && ln Makefile.in ../${tempdir}/lispintro 686 test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/lispintro
675 ln ChangeLog ../${tempdir}/lispintro 687 ln ChangeLog ../../${tempdir}/doc/lispintro
676 cd ../${tempdir}/lispintro 688 cd ../../${tempdir}/doc/lispintro
677 rm -f \#*\# =* *~ core *.Z *.z xmail 689 rm -f \#*\# =* *~ core *.Z *.z xmail
678 rm -f emacs-lisp-intro.?? *.log *.toc *.dvi *.oaux) 690 rm -f emacs-lisp-intro.?? *.log *.toc *.dvi *.oaux)
691
692 echo "Making links to \`doc/man'"
693 (cd doc/man
694 ln *.1 ../../${tempdir}/doc/man
695 ### Don't distribute gfdl.1, since no man page references it.
696 rm -f ../../${tempdir}/doc/man/gfdl.1)
679 697
680 echo "Making links to \`vms'" 698 echo "Making links to \`vms'"
681 (cd vms 699 (cd vms
682 test -f README && ln README ../${tempdir}/vms 700 test -f README && ln README ../${tempdir}/vms
683 cd ../${tempdir}/vms 701 cd ../${tempdir}/vms