Commit d175b0ae authored by Romain Francoise's avatar Romain Francoise
Browse files

Update for new doc/ directory layout.

parent 5e6876cb
2007-09-06 Romain Francoise <romain@orebokech.com>
* make-dist: Update for new doc/ directory layout.
2007-09-06 Glenn Morris <rgm@gnu.org> 2007-09-06 Glenn Morris <rgm@gnu.org>
* Makefile.in (mansrcdir): New variable. * Makefile.in (mansrcdir): New variable.
......
...@@ -154,10 +154,10 @@ echo Version numbers are $version and $shortversion ...@@ -154,10 +154,10 @@ echo Version numbers are $version and $shortversion
if [ $update = yes ]; if [ $update = yes ];
then then
if grep -s "@set EMACSVER *${shortversion}" ./man/emacs.texi > /dev/null; then if grep -s "@set EMACSVER *${shortversion}" ./doc/emacs/emacs.texi > /dev/null; then
true true
else else
echo "You must update the version number in \`./man/emacs.texi'" echo "You must update the version number in \`./doc/emacs/emacs.texi'"
sleep 5 sleep 5
fi fi
fi fi
...@@ -242,9 +242,10 @@ fi ...@@ -242,9 +242,10 @@ fi
if [ $update = yes ]; if [ $update = yes ];
then then
echo "Updating Info files" echo "Updating Info files"
(cd man; make -f Makefile.in srcdir=. info) (cd doc/emacs; make -f Makefile.in srcdir=. info)
(cd lispref; make -f Makefile.in srcdir=. info) (cd doc/misc; make -f Makefile.in srcdir=. info)
(cd lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.) (cd doc/lispref; make -f Makefile.in srcdir=. info)
(cd doc/lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.)
echo "Updating finder, custom and autoload data" echo "Updating finder, custom and autoload data"
(cd lisp; make updates EMACS="$EMACS") (cd lisp; make updates EMACS="$EMACS")
...@@ -312,7 +313,7 @@ echo "Updating version number in README" ...@@ -312,7 +313,7 @@ echo "Updating version number in README"
echo "Creating subdirectories" echo "Creating subdirectories"
for subdir in lisp site-lisp lispref lispintro \ for subdir in lisp site-lisp \
leim leim/CXTERM-DIC leim/MISC-DIC \ leim leim/CXTERM-DIC leim/MISC-DIC \
leim/SKK-DIC leim/ja-dic leim/quail \ leim/SKK-DIC leim/ja-dic leim/quail \
src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
...@@ -322,7 +323,8 @@ for subdir in lisp site-lisp lispref lispintro \ ...@@ -322,7 +323,8 @@ for subdir in lisp site-lisp lispref lispintro \
etc/images/icons etc/images/low-color etc/images/mail \ etc/images/icons etc/images/low-color etc/images/mail \
etc/images/smilies etc/images/tree-widget \ etc/images/smilies etc/images/tree-widget \
etc/images/tree-widget/default etc/images/tree-widget/folder \ etc/images/tree-widget/default etc/images/tree-widget/folder \
etc/refcards etc/tutorials info man m4 msdos vms mac mac/inc \ etc/refcards etc/tutorials info doc doc/emacs doc/misc doc/man \
doc/lispref doc/lispintro m4 msdos vms mac mac/inc \
mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \ mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \
mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \
mac/Emacs.app/Contents/Resources/English.lproj mac/Emacs.app/Contents/Resources/English.lproj
...@@ -570,7 +572,6 @@ echo "Making links to \`lwlib'" ...@@ -570,7 +572,6 @@ echo "Making links to \`lwlib'"
echo "Making links to \`etc'" echo "Making links to \`etc'"
### Don't distribute = files, TAGS, DOC files, backups, autosaves, or ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
### tex litter. ### tex litter.
### Don't distribute gfdl.1, since no man page references it.
(cd etc (cd etc
files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \
| grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$'` | grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$'`
...@@ -592,7 +593,7 @@ echo "Making links to \`etc'" ...@@ -592,7 +593,7 @@ echo "Making links to \`etc'"
fi fi
done done
cd ../${tempdir}/etc cd ../${tempdir}/etc
rm -f fns*.el gfdl.1 rm -f fns*.el
rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
rm -f TAGS) rm -f TAGS)
...@@ -639,44 +640,61 @@ echo "Making links to \`info'" ...@@ -639,44 +640,61 @@ echo "Making links to \`info'"
ln emacs dummy~ ; ln emacs \#dummy\# ln emacs dummy~ ; ln emacs \#dummy\#
rm -f *~ \#*\# core) rm -f *~ \#*\# core)
echo "Making links to \`man'" echo "Making links to \`doc/emacs'"
(cd man (cd doc/emacs
ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man ln *.texi *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/emacs
ln makefile.w32-in ../${tempdir}/man ln makefile.w32-in ../../${tempdir}/doc/emacs
test -f README && ln README ../${tempdir}/man test -f README && ln README ../../${tempdir}/doc/emacs
test -f Makefile.in && ln Makefile.in ../${tempdir}/man test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/emacs
ln ChangeLog ../${tempdir}/man ln ChangeLog ../../${tempdir}/doc/emacs
test -f split-man && ln split-man ../${tempdir}/man cp texinfo.tex ../../${tempdir}/doc/emacs
cp texinfo.tex ../${tempdir}/man cd ../../${tempdir}/doc/emacs
cd ../${tempdir}/man
rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail
rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux) rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux)
echo "Making links to \`lispref'" echo "Making links to \`doc/misc'"
(cd lispref (cd doc/misc
ln `ls -1 *.texi` ../${tempdir}/lispref ln *.texi *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/misc
ln *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/lispref ln makefile.w32-in ../../${tempdir}/doc/misc
ln *.txt *.el spellfile tindex.pl ../${tempdir}/lispref test -f README && ln README ../../${tempdir}/doc/misc
ln makefile.w32-in ../${tempdir}/lispref test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/misc
test -f README && ln README ../${tempdir}/lispref ln ChangeLog ../../${tempdir}/doc/misc
test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref cp texinfo.tex ../../${tempdir}/doc/misc
ln ChangeLog ../${tempdir}/lispref cd ../../${tempdir}/doc/misc
cd ../${tempdir}/lispref rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail
rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux)
echo "Making links to \`doc/lispref'"
(cd doc/lispref
ln `ls -1 *.texi` ../../${tempdir}/doc/lispref
ln *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/lispref
ln *.txt *.el spellfile tindex.pl ../../${tempdir}/doc/lispref
ln makefile.w32-in ../../${tempdir}/doc/lispref
test -f README && ln README ../../${tempdir}/doc/lispref
test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/lispref
ln ChangeLog ../../${tempdir}/doc/lispref
cd ../../${tempdir}/doc/lispref
rm -f \#*\# =* *~ core elisp-index* *.Z *.z xmail rm -f \#*\# =* *~ core elisp-index* *.Z *.z xmail
rm -f elisp.?? *.log *.toc *.dvi *.oaux) rm -f elisp.?? *.log *.toc *.dvi *.oaux)
echo "Making links to \`lispintro'" echo "Making links to \`doc/lispintro'"
(cd lispintro (cd doc/lispintro
ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../${tempdir}/lispintro ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../../${tempdir}/doc/lispintro
ln makefile.w32-in ../${tempdir}/lispintro ln makefile.w32-in ../../${tempdir}/doc/lispintro
test -f texinfo.tex && ln texinfo.tex ../${tempdir}/lispintro test -f texinfo.tex && ln texinfo.tex ../../${tempdir}/doc/lispintro
test -f README && ln README ../${tempdir}/lispintro test -f README && ln README ../../${tempdir}/doc/lispintro
test -f Makefile.in && ln Makefile.in ../${tempdir}/lispintro test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/lispintro
ln ChangeLog ../${tempdir}/lispintro ln ChangeLog ../../${tempdir}/doc/lispintro
cd ../${tempdir}/lispintro cd ../../${tempdir}/doc/lispintro
rm -f \#*\# =* *~ core *.Z *.z xmail rm -f \#*\# =* *~ core *.Z *.z xmail
rm -f emacs-lisp-intro.?? *.log *.toc *.dvi *.oaux) rm -f emacs-lisp-intro.?? *.log *.toc *.dvi *.oaux)
echo "Making links to \`doc/man'"
(cd doc/man
ln *.1 ../../${tempdir}/doc/man
### Don't distribute gfdl.1, since no man page references it.
rm -f ../../${tempdir}/doc/man/gfdl.1)
echo "Making links to \`vms'" echo "Making links to \`vms'"
(cd vms (cd vms
test -f README && ln README ../${tempdir}/vms test -f README && ln README ../${tempdir}/vms
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment