X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/1d95108478a3c8ea0a30e84ddb9e12bfb549abe4..8f36167aa63e856934d286067a59afacc90c4930:/make-dist diff --git a/make-dist b/make-dist index 4e70f9cd76..5c993a19cf 100755 --- a/make-dist +++ b/make-dist @@ -150,7 +150,7 @@ echo Version numbers are $version and $shortversion if [ $update = yes ]; then - if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; then + if grep -s "@set EMACSVER *${shortversion}" ./man/emacs.texi > /dev/null; then true else echo "You must update the version number in \`./man/emacs.texi'" @@ -231,7 +231,7 @@ then fi ### Make sure configure is newer than configure.in. -if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then +if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then echo "\`./configure.in' is newer than \`./configure'" >&2 echo "Running autoconf" >&2 autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; } @@ -242,6 +242,7 @@ then echo "Updating Info files" (cd man; make -f Makefile.in srcdir=. info) (cd lispref; make -f Makefile.in srcdir=. info) + (cd lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.) echo "Updating finder, custom and autoload data" (cd lisp; make updates EMACS="$EMACS") @@ -267,7 +268,9 @@ echo "Making lisp/MANIFEST" files="$files $thisdir" fi done - head -1 $files | grep '^;' | sed -e 's/;;; //' | sort > MANIFEST) + for file in $files + do sed -n 's/^;;; //p; q' $file + done | sort > MANIFEST) echo "Creating staging directory: \`${tempparent}'" @@ -289,7 +292,7 @@ mkdir ${tempdir} ### README while the rest of the tar file is still unpacking. Whoopee. echo "Making links to top-level files" ln AUTHORS FTP INSTALL README BUGS move-if-change ${tempdir} -ln ChangeLog Makefile.in configure configure.in aclocal.m4 ${tempdir} +ln ChangeLog Makefile.in configure configure.in ${tempdir} ln config.bat make-dist update-subdirs vpath.sed ${tempdir} ### Copy these files; they're cross-filesystem symlinks. cp mkinstalldirs ${tempdir} @@ -307,9 +310,9 @@ echo "Updating version number in README" echo "Creating subdirectories" -for subdir in lisp site-lisp lispref \ - leim real-leim real-leim/CXTERM-DIC real-leim/MISC-DIC \ - real-leim/SKK-DIC real-leim/ja-dic real-leim/quail \ +for subdir in lisp site-lisp lispref lispintro \ + leim leim/CXTERM-DIC leim/MISC-DIC \ + leim/SKK-DIC leim/ja-dic leim/quail \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ etc etc/e lock info man msdos vms mac mac/inc mac/inc/sys \ @@ -319,9 +322,6 @@ do mkdir ${tempdir}/${subdir} done -echo "Initializing \`leim' subdirectory" -cp noleim-Makefile.in ${tempdir}/leim/Makefile.in - echo "Making links to \`lisp' and its subdirectories" ### Don't distribute TAGS, =*.el files, site-init.el, site-load.el, or default.el. (cd lisp @@ -384,32 +384,26 @@ echo "Making links to \`lisp' and its subdirectories" fi done ) -echo "Making links to \`leim' and its subdirectories for the LEIM distribution" +echo "Making links to \`leim' and its subdirectories" ### Don't distribute TAGS, or =*.el files. (cd leim - ln makefile.nt makefile.w32-in ../${tempdir}/real-leim - ln ChangeLog README ../${tempdir}/real-leim - - ln CXTERM-DIC/*.tit ../${tempdir}/real-leim/CXTERM-DIC - ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/real-leim/SKK-DIC - ln MISC-DIC/*.* ../${tempdir}/real-leim/MISC-DIC - ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/real-leim/ja-dic - ln Makefile.in ../${tempdir}/real-leim/Makefile.in - ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/real-leim/quail - rm -f ../${tempdir}/real-leim/quail/quick-b5.* - rm -f ../${tempdir}/real-leim/quail/quick-cns.* - rm -f ../${tempdir}/real-leim/quail/tsang-b5.* - rm -f ../${tempdir}/real-leim/quail/tsang-cns.* - - cd ../${tempdir}/real-leim + ln makefile.nt makefile.w32-in ../${tempdir}/leim + ln ChangeLog README ../${tempdir}/leim + + ln CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC + ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC + ln MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC + ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic + ln Makefile.in ../${tempdir}/leim/Makefile.in + ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail + rm -f ../${tempdir}/leim/quail/quick-b5.* + rm -f ../${tempdir}/leim/quail/quick-cns.* + rm -f ../${tempdir}/leim/quail/tsang-b5.* + rm -f ../${tempdir}/leim/quail/tsang-cns.* + + cd ../${tempdir}/leim rm -f TAGS =* */=*) -### Move the real-leim directory outside of Emacs proper. -(cd ${tempparent} - mkdir ${emacsname}-leim - mkdir ${emacsname}-leim/${emacsname} - mv ${emacsname}/real-leim ${emacsname}-leim/${emacsname}/leim) - echo "Making links to \`src'" ### Don't distribute =*.[ch] files, or the configured versions of ### config.in, paths.in, or Makefile.in, or TAGS. @@ -437,7 +431,7 @@ echo "Making links to \`src'" fi done ln README ChangeLog ChangeLog.*[0-9] ../${tempdir}/src - ln makefile.nt makefile.w32-in vms-pp.trans ../${tempdir}/src + ln makefile.nt makefile.w32-in ../${tempdir}/src ln .gdbinit .dbxinit ../${tempdir}/src cd ../${tempdir}/src rm -f config.h epaths.h Makefile Makefile.c @@ -484,10 +478,10 @@ echo "Making links to \`lib-src'" echo "Making links to \`nt'" (cd nt - ln emacs.rc config.nt [a-z]*.in [a-z]*.c ../${tempdir}/nt - ln _emacs nmake.defs gmake.defs subdirs.el ../${tempdir}/nt + ln emacs.rc config.nt [a-z]*.c ../${tempdir}/nt + ln nmake.defs gmake.defs subdirs.el ../${tempdir}/nt ln [a-z]*.bat [a-z]*.h makefile.def makefile.nt ../${tempdir}/nt - ln TODO ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) + ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) echo "Making links to \`nt/inc'" (cd nt/inc @@ -548,6 +542,7 @@ echo "Making links to \`lwlib'" echo "Making links to \`etc'" ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or ### tex litter. +### Don't distribute gfdl.1, since no man page references it. (cd etc files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$'` ln $files ../${tempdir}/etc @@ -568,7 +563,7 @@ echo "Making links to \`etc'" fi done cd ../${tempdir}/etc - rm -f fns*.el + rm -f fns*.el gfdl.1 rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f TAGS) @@ -602,7 +597,9 @@ echo "Making links to \`man'" echo "Making links to \`lispref'" (cd lispref - ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/lispref + ln `ls -1 *.texi | grep -v index.texi` ../${tempdir}/lispref + ln *.aux *.cps *.fns *.kys *.vrs index.*perm ../${tempdir}/lispref + ln *.txt *.el spellfile permute-index tindex.pl ../${tempdir}/lispref test -f README && ln README ../${tempdir}/lispref test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref ln ChangeLog ../${tempdir}/lispref @@ -610,22 +607,29 @@ echo "Making links to \`lispref'" rm -f \#*\# =* *~ core elisp-index* *.Z *.z xmail rm -f elisp.?? *.log *.toc *.dvi *.oaux) +echo "Making links to \`lispintro'" +(cd lispintro + ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../${tempdir}/lispintro + test -f texinfo.tex && ln texinfo.tex ../${tempdir}/lispintro + test -f README && ln README ../${tempdir}/lispintro + test -f Makefile.in && ln Makefile.in ../${tempdir}/lispintro + ln ChangeLog ../${tempdir}/lispintro + cd ../${tempdir}/lispintro + rm -f \#*\# =* *~ core *.Z *.z xmail + rm -f emacs-lisp-intro.?? *.log *.toc *.dvi *.oaux) + echo "Making links to \`vms'" (cd vms test -f README && ln README ../${tempdir}/vms cd ../${tempdir}/vms rm -f *~) -### It would be nice if they could all be symlinks to etc's copy, but +### It would be nice if they could all be symlinks to top-level copy, but ### you're not supposed to have any symlinks in distribution tar files. -echo "Making sure copying notices are all copies of \`etc/COPYING'" -rm -f ${tempdir}/etc/COPYING -cp etc/COPYING ${tempdir}/etc/COPYING -for subdir in lisp src lib-src info msdos; do - if [ -f ${tempdir}/${subdir}/COPYING ]; then - rm ${tempdir}/${subdir}/COPYING - fi - cp etc/COPYING ${tempdir}/${subdir} +echo "Making sure copying notices are all copies of \`COPYING'" +for subdir in . etc info leim lib-src lisp lwlib mac msdos nt src; do + rm -f ${tempdir}/${subdir}/COPYING + cp COPYING ${tempdir}/${subdir} done #### Make sure that there aren't any hard links between files in the @@ -669,20 +673,17 @@ if [ "${make_tar}" = yes ]; then compress* ) gzip_extension=.Z ;; * ) gzip_extension=.gz ;; esac - echo "Creating tar files" + echo "Creating tar file" (cd ${tempparent} ; tar cvf - ${emacsname} ) \ | ${default_gzip} \ > ${emacsname}.tar${gzip_extension} - (cd ${tempparent}/${emacsname}-leim ; tar cvf - ${emacsname} ) \ - | ${default_gzip} \ - > leim-${version}${new_extension}.tar${gzip_extension} fi if [ "${clean_up}" = yes ]; then echo "Cleaning up the staging directory" rm -rf ${tempparent} else - (cd ${tempparent}; mv ${emacsname} ${emacsname}-leim ..) + (cd ${tempparent}; mv ${emacsname} ..) rm -rf ${tempparent} fi