maint: copy online docs from 'doc/manual' to apply the GNU stylesheet

The script to copy the documentation for the web to the CVS checkout
directory took the files from 'doc'.  But as those files do not
reference the GNU stylesheet, the resulting online documentation
didn't look as fancy as usual.
Instead, copy the files from 'doc/manual' which gets created by the make
target 'web-manual'.

* build-aux/update-online-manual.sh: Call the 'web-manual' make target
instead of building the documentation files in 'doc/' explicitly.
Adjust the commands to copy the just-generated files accordingly.
Remove the PostScript format as that does not get generated by the
'web-manual' target; it is probably no longer used nowadays anyway.

* NEWS (Documentation Changes): Mention the change.

Reported by Charles Burkitt <cecburkitt@gmail.com> in
https://lists.gnu.org/r/bug-findutils/2021-10/msg00008.html

2 files changed, 17 insertions, 32 deletions

diff --git a/NEWS b/NEWS
index 77bf365c..c7d58e67 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ GNU findutils NEWS - User visible changes.      -*- outline -*- (allout)
 
   The output of 'find --help' now reads better.
 
+  The HTML online manual is using the official GNU stylesheet again.
+
 ** Changes to the build process
 
   The find version without FTS, oldfind, has been completely removed.  It has
diff --git a/build-aux/update-online-manual.sh b/build-aux/update-online-manual.sh
index 71503699..81e36551 100755
--- a/build-aux/update-online-manual.sh
+++ b/build-aux/update-online-manual.sh
@@ -31,7 +31,6 @@ EOF
 }
 
 checkfiles="CVS dvi ${TEXIBASE}.html html_node html_mono info ps texi text ${TEXIBASE}.pdf"
-targets="dvi html info pdf ${TEXIBASE}.ps ${TEXIBASE}.txt ${PACKAGE}.texi_html_node.tar.gz ${TEXIBASE}_mono.html ${TEXIBASE}.texi.tar.gz ${TEXIBASE}-info.tar.gz"
 
 if [ $# -ne 1 ]; then
 	usage >&2
@@ -69,9 +68,8 @@ if [ -d "$BUILDDIR/doc" ]; then
 else
     echo "No." >&2 ; exit 1
 fi
-BUILDDIR="$BUILDDIR"/doc
 
-printf "Does the (doc) build directory have a Makefile?  "
+printf "Does the build directory have a Makefile?  "
 if [ -f "$BUILDDIR"/Makefile ]; then
     echo Yes.
 else
@@ -83,12 +81,12 @@ fi
 ## Figure out where the source code lives by asking Make.
 ##
 REL_SRCDIR="$(cd $BUILDDIR && grep '^srcdir =' Makefile | cut -d= -f2)"
-echo Build directory is $BUILDDIR.
-echo Relative path to source directory is $REL_SRCDIR
+echo "Build directory: '$BUILDDIR'"
+echo "Relative path to source directory: '$REL_SRCDIR'"
 
 SRCDIR="$(cd $BUILDDIR && cd $REL_SRCDIR && /bin/pwd)"
 unset REL_SRCDIR
-echo Source directory is $SRCDIR.
+echo "Source directory: '$SRCDIR'"
 
 
 if true
@@ -97,42 +95,30 @@ then
     ## Build (most of) the files we need.
     ## We collect them from the build directory afterwards.
     ##
-    make -C "$BUILDDIR" $targets
-    cp ${BUILDDIR}/${TEXIBASE}.texi.tar.gz texi/${TEXIBASE}.texi.tar.gz
-    cp ${BUILDDIR}/${TEXIBASE}-info.tar.gz info/${TEXIBASE}-info.tar.gz
-
-    echo Collecting the PostScript file...
-    rm -f ps/${TEXIBASE}.ps.gz
-    gzip -9 < ${BUILDDIR}/${TEXIBASE}.ps > ps/${TEXIBASE}.ps.gz
+    make -C "$BUILDDIR" web-manual
+    cp ${BUILDDIR}/doc/manual/${TEXIBASE}.texi.tar.gz texi/${TEXIBASE}.texi.tar.gz
+    cp ${BUILDDIR}/doc/manual/${TEXIBASE}.info.tar.gz info/${TEXIBASE}-info.tar.gz
 
     echo Collecting the DVI file...
-    cp  $BUILDDIR/${TEXIBASE}.dvi dvi/
-    rm dvi/${TEXIBASE}.dvi.gz
-    gzip -9 dvi/${TEXIBASE}.dvi
+    cp  $BUILDDIR/doc/manual/${TEXIBASE}.dvi.gz dvi/${TEXIBASE}.dvi.gz
 
     echo Collecting the PDF file...
-    cp  $BUILDDIR/${TEXIBASE}.pdf .
+    cp  $BUILDDIR/doc/manual/${TEXIBASE}.pdf .
 
     echo "Collecting the text files (compressed and uncompressed)..."
-    rm -f text/${TEXIBASE}.txt text/${TEXIBASE}.txt.gz
-    cp $BUILDDIR/${TEXIBASE}.txt text/
-    gzip -9 text/${TEXIBASE}.txt
-    cp $BUILDDIR/${TEXIBASE}.txt text/
+    cp $BUILDDIR/doc/manual/${TEXIBASE}.txt text
+    cp $BUILDDIR/doc/manual/${TEXIBASE}.txt.gz text
 
     echo "Collecting the all-in-one-file HTML (compressed and uncompressed)..."
-    rm -f html_mono/${TEXIBASE}.html html_mono/${TEXIBASE}.html.gz
-    cp $BUILDDIR/${TEXIBASE}_mono.html html_mono/${TEXIBASE}.html
-    gzip -9 html_mono/${TEXIBASE}.html
-    cp $BUILDDIR/${TEXIBASE}_mono.html html_mono/${TEXIBASE}.html
-
+    cp $BUILDDIR/doc/manual/${TEXIBASE}.html html_mono
+    cp $BUILDDIR/doc/manual/${TEXIBASE}.html.gz html_mono
 
     echo "Collecting the file-per-node HTML tar file..."
-    rm -f html_node/${PACKAGE}.texi_html_node.tar.gz
     find html_node/${TEXIBASE}_html -name '*.html' -type f -delete
-    cp $BUILDDIR/${PACKAGE}.texi_html_node.tar.gz html_node/
+    cp $BUILDDIR/doc/manual/${TEXIBASE}.html_node.tar.gz html_node/${PACKAGE}.texi_html_node.tar.gz
 
     echo "Unpacking the node-per-node HTML tar file..."
-    ( cd html_node && tar zxf ${PACKAGE}.texi_html_node.tar.gz && mv ${TEXIBASE}.html/*.html ${TEXIBASE}_html )
+    (set -x; cd html_node/${TEXIBASE}_html&& tar -zxf ../${PACKAGE}.texi_html_node.tar.gz )
 
 fi
 
@@ -196,9 +182,6 @@ This manual is available in the following formats:
       $(linkfor "dvi/${TEXIBASE}.dvi.gz" "gzipped" "a TeX dvi file")
   </LI>
   <LI>
-      $(linkfor "ps/${TEXIBASE}.ps.gz" "gzipped characters" "a PostScript file")
-  </LI>
-  <LI>
       $(linkfor "${TEXIBASE}.pdf" "PDF file" PDF)
   </LI>
   <LI>the original