aboutsummaryrefslogtreecommitdiff
path: root/maintainer-scripts
diff options
context:
space:
mode:
authorjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2001-11-05 08:47:51 +0000
committerjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2001-11-05 08:47:51 +0000
commitcb98586010291db435cb733ee6927b3a083a22be (patch)
treefa79d079a58d871707192b93306be464cb798fb9 /maintainer-scripts
parente864554bde66c04e62269a5a4385976f56338dd9 (diff)
* update_web_docs: Allow for the same file name in different
directories. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46784 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'maintainer-scripts')
-rw-r--r--maintainer-scripts/ChangeLog5
-rwxr-xr-xmaintainer-scripts/update_web_docs18
2 files changed, 15 insertions, 8 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 9bb32e564ce..5d8c609d0f1 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-05 Joseph S. Myers <jsm28@cam.ac.uk>
+
+ * update_web_docs: Allow for the same file name in different
+ directories.
+
2001-10-29 Joseph S. Myers <jsm28@cam.ac.uk>
* update_web_docs: Generate libiberty and gnat-style manuals.
diff --git a/maintainer-scripts/update_web_docs b/maintainer-scripts/update_web_docs
index fd80c9dfbe7..6872a4a329d 100755
--- a/maintainer-scripts/update_web_docs
+++ b/maintainer-scripts/update_web_docs
@@ -87,19 +87,21 @@ cd $WORKDIR
find $CVSROOT/gcc -name \*.texi,v -print | fgrep -v -f/home/gccadmin/scripts/doc_exclude | sed -e s#$CVSROOT/##g -e s#,v##g -e s#Attic/##g > FILES
-# Checkout all the texi files and get them into a single directory.
-# If we ever have texi files with the same name we'll have to do this
-# differently.
+# Checkout all the texi files.
cvs -Q co -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/texinfo.tex gcc/gcc/doc/texinfo.tex gcc/gcc/doc/include/texinfo.tex
-mv `find . -name \*.texi -print` .
-mv `find . -name \*.tex -print` .
+
+# Find the directory to pass to -I; this is the one with texinfo.tex
+# and fdl.texi.
+texitexloc=`find . -name texinfo.tex`
+includedir=${texitexloc%/*}
# Now convert the relevant files from texi to HTML and PostScript.
for file in cpp chill cppinternals gcc gcj g77 gnat-style libiberty \
objc-features porting; do
- if [ -e ${file}.texi ]; then
- /usr/local/bin/texi2html -glossary -menu -split_chapter ${file}.texi
- texi2dvi ${file}.texi </dev/null && dvips -o ${file}.ps ${file}.dvi
+ filename=`find . -name ${file}.texi`
+ if [ "${filename}" ]; then
+ /usr/local/bin/texi2html -glossary -menu -split_chapter -I ${includedir} ${filename}
+ texi2dvi -I ${includedir} ${filename} </dev/null && dvips -o ${file}.ps ${file}.dvi
fi
done