--- a/docs/build-docs.sh	Thu Feb 06 20:32:38 2020 +0200
+++ b/docs/build-docs.sh	Sat Jan 30 15:40:43 2021 +0200
@@ -13,16 +13,16 @@
 
 ### Get paths, if available
 echo "* Initialization"
-CPWD=`pwd`
-CONVERT=`which convert`
-PNMTOPS=`which pnmtops`
-GIFTOPNM=`which giftopnm`
-TIDY=`which tidy`
-XSLTPROC=`which xsltproc`
-FOP=`which fop`
-CATALOGS1="$DOCBOOKBASE/xhtml/chunk.xsl"
-CATALOGS2="$DOCBOOKBASE/xhtml/docbook.xsl"
-CATALOGS3="$DOCBOOKBASE/fo/docbook.xsl"
+CPWD="$(pwd)"
+CONVERT="$(which convert)"
+PNMTOPS="$(which pnmtops)"
+GIFTOPNM="$(which giftopnm)"
+TIDY="$(which tidy)"
+XSLTPROC="$(which xsltproc)"
+FOP="$(which fop)"
+CATALOGS1="${DOCBOOKBASE}/xhtml/chunk.xsl"
+CATALOGS2="${DOCBOOKBASE}/xhtml/docbook.xsl"
+CATALOGS3="${DOCBOOKBASE}/fo/docbook.xsl"
 
 
 ### Check for locally installed FOP
@@ -41,14 +41,14 @@
 if test -n "$CONVERT" && test -x "$CONVERT"; then
 	echo "** GraphicsMagic/ImageMagick convert found"
 	for i in *.gif; do
-		TOUTFILE=`echo "$i" | sed "s/.gif/.eps/"`
+		TOUTFILE="$(echo "$i" | sed "s/.gif/.eps/")"
 		echo " - $i -> $TOUTFILE"
 		$CONVERT "$i" "$TOUTFILE"
 	done
 elif test -n "$PNMTOPS" && test -x "$PNMTOPS" && test -n "$GIFTOPNM" && test -x "$GIFTOPNM"; then
 	echo "** NetPBM tools found"
 	for i in *.gif; do
-		TOUTFILE=`echo "$i" | sed "s/.gif/.eps/"`
+		TOUTFILE="$(echo "$i" | sed "s/.gif/.eps/")"
 		echo " - $i -> $TOUTFILE"
 		$GIFTOPNM "$i" | $PNMTOPS -scale=0.5 -noturn > "$TOUTFILE"
 	done
@@ -126,9 +126,11 @@
 
 ### Generate PDF
 rm -f "$PDFFILE"
-if test -n "$FOP" && test -x "$FOP" && test -e "$SRCXML"; then
+if test -n "$FOP" && test -x "$FOP" && test -e "$SRCXML" && test -n "$XSLTPROC" && test -x "$XSLTPROC"; then
 	echo "* PDF .."
-	$FOP -xml "$SRCXML" -xsl "$CATALOGS3" -pdf "$PDFFILE"
+#	$XSLTPROC "$SRCFO" /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl "$SRCXML"
+	$XSLTPROC -o "$SRCFO" "$CATALOGS3" "$SRCXML" && \
+	$FOP -pdf "$PDFFILE" -fo "$SRCFO"
 fi
 
 ## Remove temporary files