Module Name:    src
Committed By:   yamt
Date:           Thu May 22 16:39:51 UTC 2014

Modified Files:
        src/external/gpl3/gcc/dist/maintainer-scripts [yamt-pagecache]:
            ChangeLog README crontab gcc_release update_version_svn
            update_web_docs_libstdcxx_svn update_web_docs_svn

Log Message:
sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
    src/external/gpl3/gcc/dist/maintainer-scripts/ChangeLog
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc/dist/maintainer-scripts/README \
    src/external/gpl3/gcc/dist/maintainer-scripts/crontab \
    src/external/gpl3/gcc/dist/maintainer-scripts/gcc_release \
    src/external/gpl3/gcc/dist/maintainer-scripts/update_version_svn \
    src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_libstdcxx_svn 
\
    src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_svn

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/maintainer-scripts/ChangeLog
diff -u src/external/gpl3/gcc/dist/maintainer-scripts/ChangeLog:1.1.1.1.2.1 src/external/gpl3/gcc/dist/maintainer-scripts/ChangeLog:1.1.1.1.2.2
--- src/external/gpl3/gcc/dist/maintainer-scripts/ChangeLog:1.1.1.1.2.1	Tue Oct 30 18:57:33 2012
+++ src/external/gpl3/gcc/dist/maintainer-scripts/ChangeLog	Thu May 22 16:39:51 2014
@@ -1,22 +1,140 @@
-2012-07-02  Release Manager
+2014-02-01  Dmitry Gorbachev  <[email protected]>
 
-	* GCC 4.5.4 released.
+	PR other/56653
+	* gcc_release: Avoid printing empty line to generated MD5SUMS files.
+	Bump copyright year.
 
-2011-04-28  Release Manager
+2013-10-16  Release Manager
 
-	* GCC 4.5.3 released.
+	* GCC 4.8.2 released.
 
-2010-12-16  Release Manager
+2013-05-31  Release Manager
 
-	* GCC 4.5.2 released.
+	* GCC 4.8.1 released.
 
-2010-07-31  Release Manager
+2013-03-22  Release Manager
 
-	* GCC 4.5.1 released.
+	* GCC 4.8.0 released.
 
-2010-04-14  Release Manager
+2012-07-02  Richard Guenther  <[email protected]>
 
-	* GCC 4.5.0 released.
+	* crontab: Disable snapshots from gcc-4_5-branch.
+	* update_version_svn: Ingore gcc-4_5-branch.
+
+2012-03-23  Richard Guenther  <[email protected]>
+
+	* crontab: Enable snapshots from gcc-4_7-branch.
+
+2012-03-13  Jakub Jelinek  <[email protected]>
+
+	* crontab: Remove 4.4 branch from the list of snapshots to make.
+	* update_version_svn (IGNORE_BRANCHES): Add gcc-4_4-branch.
+
+2012-03-05  Richard Guenther  <[email protected]>
+
+	* crontab: Remove 4.3 branch from the list of snapshots to make.
+
+2012-03-02  Richard Guenther  <[email protected]>
+
+	* crontab: Fix day-of-week.
+
+2012-03-02  Richard Guenther  <[email protected]>
+
+	* crontab: Update for 4.7 branching.
+
+2011-11-21  Gerald Pfeifer  <[email protected]>
+
+	* update_web_docs_svn: Make $DOCSDIR group writable after
+	creating it.
+
+2011-06-27  Richard Guenther  <[email protected]>
+
+	* update_version_svn (IGNORE_BRANCHES): Add gcc-4_3-branch.
+
+2011-05-22  Joseph Myers  <[email protected]>
+
+	* gcc_release (adjust_dirs, maybe_build_tarfile): Remove.
+	(build_tarfiles): Don't build separate files for languages and
+	core.
+	(build_diffs): Only build one set of diffs.
+	(announce_snapshot): Only announce one tar file.
+	(ADA_DIRS, CPLUSPLUS_DIRS, FORTRAN95_DIRS, GO_DIRS, JAVA_DIRS,
+	OBJECTIVEC_DIRS, TESTSUITE_DIRS): Remove.  Don't adjust names
+	relative to WORKING_DIRECTORY.
+
+2011-04-21  Jakub Jelinek  <[email protected]>
+
+	* gcc_release (maybe_build_tarfile): Don't build a tarfile if
+	the first directory doesn't exist.
+
+2011-03-14  Jakub Jelinek  <[email protected]>
+
+	* crontab: Enable 4.7 snapshots, switch 4.6 snapshots to
+	4.6 branch.
+
+2011-02-07  Joseph Myers  <[email protected]>
+
+	* update_web_docs_svn: Generate libquadmath-vers.texi.
+
+2011-01-31  Gerald Pfeifer  <[email protected]>
+
+	* update_version_svn (FILES): Merge with datestamp_FILES.
+	(SVNROOT2): Introduce and use.
+	
+2011-01-30  Gerald Pfeifer  <[email protected]>
+
+	* update_version_svn (SVN): Remove obsolete comment.
+	(CURR_DATE): Fix description.
+	Fix description of checkout procedure.
+
+2010-12-18  Tobias Burnus  <[email protected]>
+
+	* update_web_docs_svn (MANUALS): Add libquadmath.
+
+2010-12-08  Ian Lance Taylor  <[email protected]>
+
+	* gcc_release: Add support for releasing Go as a separate
+	tarball.
+
+2010-12-08  Ian Lance Taylor  <[email protected]>
+
+	* update_web_docs_svn (MANUALS): Add gccgo.
+
+2010-12-08  Ian Lance Taylor  <[email protected]>
+
+	* README: Change "CVS" to "Subversion".
+
+2010-08-23  Gerald Pfeifer  <[email protected]>
+
+	* gcc_release (snapshot_print): Also include an sha1 hash for
+	every tarball.  Slightly tweak indentation.
+
+2010-08-15  Gerald Pfeifer  <[email protected]>
+
+	* gcc_release (CVSROOT): Remove all occurrences.
+
+2010-08-14  Gerald Pfeifer  <[email protected]>
+
+	* gcc_release (snapshot_print): Include md5 hash for every tarball
+	in the README file and notification mail.
+
+2010-08-01  Gerald Pfeifer  <[email protected]>
+
+	* update_web_docs_libstdcxx_svn: Do not compress generated .html
+	files any more.
+
+2010-06-24  Joseph Myers  <[email protected]>
+
+	* update_web_docs_svn: Also pass -I option pointing to ada/ source
+	directory for Ada manual.
+
+2010-04-16  Joseph Myers  <[email protected]>
+
+	* crontab: Enable 4.6 snapshots.
+
+2010-04-07  Joseph Myers  <[email protected]>
+
+	* crontab: Switch 4.5 snapshots to 4.5 branch.
 
 2010-03-31  Joseph Myers  <[email protected]>
 

Index: src/external/gpl3/gcc/dist/maintainer-scripts/README
diff -u src/external/gpl3/gcc/dist/maintainer-scripts/README:1.1.1.1 src/external/gpl3/gcc/dist/maintainer-scripts/README:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/maintainer-scripts/README:1.1.1.1	Tue Jun 21 01:19:50 2011
+++ src/external/gpl3/gcc/dist/maintainer-scripts/README	Thu May 22 16:39:51 2014
@@ -2,5 +2,5 @@ This directory contains various files us
 gcc.gnu.org, mainly for automated tasks such as the daily update of
 the date in gcc/DATESTAMP.  There isn't presently any scheme for files
 checked in here to be automatically checked out and used by gccadmin,
-so the files in CVS and those used by gccadmin must be kept in sync
-manually.
+so the files in Subversion and those used by gccadmin must be kept in
+sync manually.
Index: src/external/gpl3/gcc/dist/maintainer-scripts/crontab
diff -u src/external/gpl3/gcc/dist/maintainer-scripts/crontab:1.1.1.1 src/external/gpl3/gcc/dist/maintainer-scripts/crontab:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/maintainer-scripts/crontab:1.1.1.1	Tue Jun 21 01:19:50 2011
+++ src/external/gpl3/gcc/dist/maintainer-scripts/crontab	Thu May 22 16:39:51 2014
@@ -1,6 +1,6 @@
 16  0 * * * sh /home/gccadmin/scripts/update_version_svn
 50  0 * * * sh /home/gccadmin/scripts/update_web_docs_svn
 55  0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn
-32 22 * * 0 sh /home/gccadmin/scripts/gcc_release -s 4.3:branches/gcc-4_3-branch -l -d /sourceware/snapshot-tmp/gcc all
-32 22 * * 2 sh /home/gccadmin/scripts/gcc_release -s 4.4:branches/gcc-4_4-branch -l -d /sourceware/snapshot-tmp/gcc all
-32 22 * * 4 sh /home/gccadmin/scripts/gcc_release -s 4.5:trunk                   -l -d /sourceware/snapshot-tmp/gcc all
+32 22 * * 5 sh /home/gccadmin/scripts/gcc_release -s 4.6:branches/gcc-4_6-branch -l -d /sourceware/snapshot-tmp/gcc all
+32 22 * * 6 sh /home/gccadmin/scripts/gcc_release -s 4.7:branches/gcc-4_7-branch -l -d /sourceware/snapshot-tmp/gcc all
+32 22 * * 7 sh /home/gccadmin/scripts/gcc_release -s 4.8:trunk -l -d /sourceware/snapshot-tmp/gcc all
Index: src/external/gpl3/gcc/dist/maintainer-scripts/gcc_release
diff -u src/external/gpl3/gcc/dist/maintainer-scripts/gcc_release:1.1.1.1 src/external/gpl3/gcc/dist/maintainer-scripts/gcc_release:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/maintainer-scripts/gcc_release:1.1.1.1	Tue Jun 21 01:19:50 2011
+++ src/external/gpl3/gcc/dist/maintainer-scripts/gcc_release	Thu May 22 16:39:51 2014
@@ -9,7 +9,7 @@
 # Contents:
 #   Script to create a GCC release.
 #
-# Copyright (c) 2001, 2002, 2006, 2009, 2010 Free Software Foundation.
+# Copyright (c) 2001-2014 Free Software Foundation.
 #
 # This file is part of GCC.
 #
@@ -89,16 +89,6 @@ changedir() {
     error "Could not change directory to $1"
 }
 
-# Each of the arguments is a directory name, relative to the top
-# of the source tree.  Return another name for that directory, relative
-# to the working directory.
-
-adjust_dirs() {
-  for x in $@; do
-    echo `basename ${SOURCE_DIRECTORY}`/$x
-  done
-}
-
 # Build the source tree that will be the basis for the release
 # in ${WORKING_DIRECTORY}/gcc-${RELEASE}.
 
@@ -223,7 +213,7 @@ EOF
 #
 # Suggested usage:
 # md5sum -c MD5SUMS | grep -v \"OK$\"
-" > MD5SUMS
+#" > MD5SUMS
 
   find . -type f |
   sed -e 's:^\./::' -e '/MD5SUMS/d' |
@@ -247,25 +237,6 @@ build_tarfile() {
   FILE_LIST="${FILE_LIST} ${TARFILE}"
 }
 
-# Build a single tarfile if any of the directories listed exist,
-# but not if none of them do (because that component doesn't exist
-# on this branch).
-maybe_build_tarfile() {
-  dest=$1
-  shift
-  dir_exists=0
-  for maybe_dir in "$@"; do
-    if [ -d "$maybe_dir" ]; then
-      dir_exists=1
-    fi
-  done
-  if [ $dir_exists = 1 ]; then
-    build_tarfile "$dest" "$@"
-  else
-    echo "Not building $dest tarfile"
-  fi
-}
-
 # Build the various tar files for the release.
 
 build_tarfiles() {
@@ -281,23 +252,6 @@ build_tarfiles() {
  
   # Build one huge tarfile for the entire distribution.
   build_tarfile gcc-${RELEASE} `basename ${SOURCE_DIRECTORY}`
-
-  # Now, build one for each of the languages.
-  maybe_build_tarfile gcc-ada-${RELEASE} ${ADA_DIRS}
-  maybe_build_tarfile gcc-g++-${RELEASE} ${CPLUSPLUS_DIRS}
-  maybe_build_tarfile gcc-fortran-${RELEASE} ${FORTRAN95_DIRS}
-  maybe_build_tarfile gcc-java-${RELEASE} ${JAVA_DIRS}
-  maybe_build_tarfile gcc-objc-${RELEASE} ${OBJECTIVEC_DIRS}
-  maybe_build_tarfile gcc-testsuite-${RELEASE} ${TESTSUITE_DIRS}
-   
-  # The core is everything else.
-  EXCLUDES=""
-  for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN95_DIRS}\
-	   ${JAVA_DIRS} ${OBJECTIVEC_DIRS} ${TESTSUITE_DIRS}; do
-    EXCLUDES="${EXCLUDES} --exclude $x"
-  done
-  build_tarfile gcc-core-${RELEASE} ${EXCLUDES} \
-    `basename ${SOURCE_DIRECTORY}`
 }
 
 # Build .gz files.
@@ -315,7 +269,7 @@ build_diffs() {
   old_vers=${old_file%.tar.bz2}
   old_vers=${old_vers#gcc-}
   inform "Building diffs against version $old_vers"
-  for f in gcc gcc-ada gcc-g++ gcc-fortran gcc-java gcc-objc gcc-testsuite gcc-core; do
+  for f in gcc; do
     old_tar=${old_dir}/${f}-${old_vers}.tar.bz2
     new_tar=${WORKING_DIRECTORY}/${f}-${RELEASE}.tar.bz2
     if [ ! -e $old_tar ]; then
@@ -386,7 +340,12 @@ upload_files() {
 # Print description if snapshot exists.
 snapshot_print() {
   if [ -e ${RELEASE}/$1 ]; then
-     printf "%-38s%s\n\n" "$1" "$2" >> ${SNAPSHOT_README}
+    hash=`openssl  md5  ${RELEASE}/$1 | sed -e 's#(.*)##' -e 's# *= *#=#'`
+    hash2=`openssl sha1 ${RELEASE}/$1 | sed -e 's#(.*)##' -e 's# *= *#=#'`
+
+    printf " %-37s%s\n\n  %s\n  %s\n\n" "$1" "$2" "$hash" "$hash2" \
+      >> ${SNAPSHOT_README}
+
      echo "  <tr><td><a href=\"$1\">$1</a></td>" >> ${SNAPSHOT_INDEX}
      echo "      <td>$2</td></tr>" >> ${SNAPSHOT_INDEX}
   fi
@@ -435,14 +394,7 @@ with the following options: <code>"svn:/
 
 <table>" > ${SNAPSHOT_INDEX}
        
-  snapshot_print gcc-${RELEASE}.tar.bz2 "Complete GCC (includes all of below)"
-  snapshot_print gcc-core-${RELEASE}.tar.bz2 "C front end and core compiler"
-  snapshot_print gcc-ada-${RELEASE}.tar.bz2 "Ada front end and runtime"
-  snapshot_print gcc-fortran-${RELEASE}.tar.bz2 "Fortran front end and runtime"
-  snapshot_print gcc-g++-${RELEASE}.tar.bz2 "C++ front end and runtime"
-  snapshot_print gcc-java-${RELEASE}.tar.bz2 "Java front end and runtime"
-  snapshot_print gcc-objc-${RELEASE}.tar.bz2 "Objective-C front end and runtime"
-  snapshot_print gcc-testsuite-${RELEASE}.tar.bz2 "The GCC testsuite"
+  snapshot_print gcc-${RELEASE}.tar.bz2 "Complete GCC"
 
   echo \
 "Diffs from "${BRANCH}"-"${LAST_DATE}" are available in the diffs/ subdirectory.
@@ -542,15 +494,6 @@ WORKING_DIRECTORY=""
 # The directory that will contain the GCC sources.
 SOURCE_DIRECTORY=""
 
-# The directories that should be part of the various language-specific
-# tar files.  These are all relative to the top of the source tree.
-ADA_DIRS="gcc/ada libada gnattools"
-CPLUSPLUS_DIRS="gcc/cp libstdc++-v3"
-FORTRAN95_DIRS="gcc/fortran libgfortran"
-JAVA_DIRS="gcc/java libjava libffi boehm-gc"
-OBJECTIVEC_DIRS="gcc/objc gcc/objcp libobjc"
-TESTSUITE_DIRS="gcc/testsuite"
-
 # Non-zero if this is the final release, rather than a prerelease.
 FINAL=0
 
@@ -688,25 +631,13 @@ fi
 WORKING_DIRECTORY="${DESTINATION}/gcc-${RELEASE}"
 SOURCE_DIRECTORY="${WORKING_DIRECTORY}/gcc-${RELEASE}"
 
-# Recompute the names of all the language-specific directories,
-# relative to the WORKING_DIRECTORY.
-ADA_DIRS=`adjust_dirs ${ADA_DIRS}`
-CPLUSPLUS_DIRS=`adjust_dirs ${CPLUSPLUS_DIRS}`
-FORTRAN95_DIRS=`adjust_dirs ${FORTRAN95_DIRS}`
-JAVA_DIRS=`adjust_dirs ${JAVA_DIRS}`
-OBJECTIVEC_DIRS=`adjust_dirs ${OBJECTIVEC_DIRS}`
-TESTSUITE_DIRS=`adjust_dirs ${TESTSUITE_DIRS}`
-
 # Set up SVNROOT.
 if [ $LOCAL -eq 0 ]; then
     SVNROOT="svn+ssh://${SVN_USERNAME}@${SVN_SERVER}${SVN_REPOSITORY}"
-    CVSROOT=":ext:${SVN_USERNAME}@gcc.gnu.org/cvs/gcc"
 else
     SVNROOT="file:///svn/gcc"
-    CVSROOT="/cvs/gcc"
 fi
 export SVNROOT
-export CVSROOT
 
 ########################################################################
 # Main Program
Index: src/external/gpl3/gcc/dist/maintainer-scripts/update_version_svn
diff -u src/external/gpl3/gcc/dist/maintainer-scripts/update_version_svn:1.1.1.1 src/external/gpl3/gcc/dist/maintainer-scripts/update_version_svn:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/maintainer-scripts/update_version_svn:1.1.1.1	Tue Jun 21 01:19:50 2011
+++ src/external/gpl3/gcc/dist/maintainer-scripts/update_version_svn	Thu May 22 16:39:51 2014
@@ -6,7 +6,7 @@
 # in the space separated list in $ADD_BRANCHES.
 
 SVNROOT=${SVNROOT:-"file:///svn/gcc"}
-IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0|4_1|4_2)-branch'
+IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0|4_1|4_2|4_3|4_4|4_5)-branch'
 ADD_BRANCHES='HEAD'
 
 # Run this from /tmp.
@@ -15,7 +15,6 @@ export SVNROOT
 /bin/mkdir /tmp/$$
 cd /tmp/$$
 
-# The path to cvs.
 SVN=${SVN:-/usr/bin/svn}
 
 # Compute the branches which we should update.
@@ -26,31 +25,27 @@ BRANCHES=`$SVN ls $SVNROOT/branches \
 # Always update the mainline.
 BRANCHES="${BRANCHES} ${ADD_BRANCHES}"
 
-# ARGS is passed to 'cvs co'
+# This is put into the datestamp files.
 CURR_DATE=`/bin/date +"%Y%m%d"`
 
-# version is all there is
 datestamp_FILES="gcc/DATESTAMP"
 
-FILES="$datestamp_FILES"
 
 # Assume all will go well.
 RESULT=0
 for BRANCH in $BRANCHES; do
   echo "Working on \"$BRANCH\"."
-  # Check out the files on the branch.  HEAD is a special case; if
-  # you check out files with -r HEAD, CVS will not let you check 
-  # in changes.
+  # Check out the files on the branch.  HEAD is in a different namespace.
   if test "$BRANCH" = HEAD; then 
-    for i in $FILES; do
-      ${SVN} -q co -N ${SVNROOT}/trunk/`dirname $i` `basename $i`
-    done
-  else
-    for i in $FILES; do
-      ${SVN} -q co -N ${SVNROOT}/branches/${BRANCH}/`dirname $i` `basename $i`
-    done
+    SVNROOT2=${SVNROOT}/trunk
+  else    
+    SVNROOT2=${SVNROOT}/branches/${BRANCH}
   fi
 
+  for i in $datestamp_FILES; do
+    ${SVN} -q co -N ${SVNROOT2}/`dirname $i` `basename $i`
+  done
+
   # There are no files to commit yet.
   COMMIT_FILES=""
 
@@ -81,7 +76,7 @@ for BRANCH in $BRANCHES; do
   fi
   
   # Remove the files.
-  for i in $FILES; do
+  for i in $datestamp_FILES; do
    rm -rf /tmp/$$/`basename $i`
   done
 done
Index: src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_libstdcxx_svn
diff -u src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_libstdcxx_svn:1.1.1.1 src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_libstdcxx_svn:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_libstdcxx_svn:1.1.1.1	Tue Jun 21 01:19:50 2011
+++ src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_libstdcxx_svn	Thu May 22 16:39:51 2014
@@ -37,11 +37,6 @@ svn -q export $SVNROOT/trunk/$GETTHIS do
 cd doc
 rm -f Makefile
 
-# build a compressed copy of the HTML, preserve directory structure
-for file in `find . -name "*.html" -print`; do
-    gzip --best < $file > $file.gz
-done
-
 # copy the tree to the onlinedocs area, preserve directory structure
 #find . -depth -print | cpio -pdv $WWWDIR
 find . -depth -print | cpio -pd $WWWDIR > /dev/null 2>&1
Index: src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_svn
diff -u src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_svn:1.1.1.1 src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_svn:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_svn:1.1.1.1	Tue Jun 21 01:19:50 2011
+++ src/external/gpl3/gcc/dist/maintainer-scripts/update_web_docs_svn	Thu May 22 16:39:51 2014
@@ -15,6 +15,7 @@ MANUALS="cpp
   cppinternals
   fastjar
   gcc
+  gccgo
   gccint
   gcj
   gfortran
@@ -27,6 +28,7 @@ MANUALS="cpp
   gnat-style
   gnat_rm
   libgomp
+  libquadmath
   libiberty
   porting"
 
@@ -91,6 +93,7 @@ fi
 
 if [ ! -d $DOCSDIR ]; then
   mkdir $DOCSDIR
+  chmod g+w $DOCSDIR
 fi
 
 if [ -z "$RELEASE" ]; then
@@ -149,14 +152,22 @@ fi
    echo "@set BUGURL @uref{http://gcc.gnu.org/bugs/}";
 ) > $includedir/gcc-vers.texi
 
+# Generate libquadmath-vers.texi.
+echo "@set BUGURL @uref{http://gcc.gnu.org/bugs/}"; \
+  > $includedir/libquadmath-vers.texi
+
 # Now convert the relevant files from texi to HTML, PDF and PostScript.
 for file in $MANUALS; do
   filename=`find . -name ${file}.texi`
   if [ "${filename}" ]; then
-    makeinfo --html -I ${includedir} -I `dirname ${filename}` -o ${file} ${filename}
+    includes="-I ${includedir} -I `dirname ${filename}`"
+    if [ "$file" = "gnat_ugn_unw" ]; then
+      includes="$includes -I gcc/gcc/ada"
+    fi
+    makeinfo --html $includes -o ${file} ${filename}
     tar cf ${file}-html.tar ${file}/*.html
-    texi2dvi -I ${includedir} -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
-    texi2pdf -I ${includedir} -o ${file}.pdf ${filename} </dev/null
+    texi2dvi $includes -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
+    texi2pdf $includes -o ${file}.pdf ${filename} </dev/null
     mkdir -p $DOCSDIR/$file
   fi
 done

Reply via email to