Merge branch 'develop' into 'develop'

Small fixes so that manual.pdf can be created

See merge request embeddable-common-lisp/ecl!360

src/doc/manual/Makefile

@@ -1,5 +1,7 @@
 FILES= *.txi */*.txi figures/*
 
+CWD=$(shell pwd)
+
 .PHONY: all pdf info html
 
 all: pdf info html
@@ -9,7 +11,7 @@ info: ecl.info.gz
 html: html/index.html
 
 manual.pdf: $(FILES)
-	texi2pdf manual.txi
+	PDFTEX=$(CWD)/z-texi2pdfetex-fix-aux texi2pdf manual.txi
 
 ecl.info.gz: $(FILES)
 	$(MAKEINFO) --no-split manual.txi
@@ -22,4 +24,5 @@ html/index.html: $(FILES)
 	cp -r figures html
 
 clean:
-	rm -rf *.{aux,cf,cfs,cp,cpp,cpps,cps,ex,exs,fn,fns,ft,fts,log,lsp,lsps,toc,tp,tps,vr,vrs,pdf,info,info-1,info-2,info.gz,html} html
+	-rm -rf *.{aux,cf,cfs,cp,cpp,cpps,cps,ex,exs,fn,fns,ft,fts,log,lsp,lsps,toc,tp,tps,vr,vrs,pdf,info,info-1,info-2,info.gz,html} html \
+	       manual.[ceflvpa]* manual.toc manual.tp manual.tps

src/doc/manual/macros.txi

@@ -132,7 +132,7 @@
 @inlinefmtifelse{html, @code{@ref{\code\}}, @code{\code\}}
 @end macro
 
-@macro seealso{node}
+@macro noseealso{node}
 @paragraph{See also}
 @coderef{\node\}
 @end macro

src/doc/manual/z-texi2pdfetex-fix-aux

@@ -0,0 +1,19 @@
+#! /bin/sh -
+
+for f in x *.aux ; do
+	if [ -f $f ] ; then
+		sed -e 's/@unhbox @voidb@x @kern .07em @vbox {@hrule width.3em height.1ex}@kern .07em//' \
+		< ${f} > temp
+		mv temp $f
+	fi
+done
+
+pdfetex $*
+
+for f in x *.aux ; do
+	if [ -f $f ] ; then
+		sed -e 's/@unhbox @voidb@x @kern .07em @vbox {@hrule width.3em height.1ex}@kern .07em//' \
+		< ${f} > temp
+		mv temp $f
+	fi
+done