# HG changeset patch
# User Rik <rik@octave.org>
# Date 1437506496 25200
# Node ID 07ddaaeb90407fa32f82413a7b23b270c63e1044
# Parent  f74ab65ee1bf33383e73f05cbbc780a3afc11a89
Remove all temporary documentation files with 'maintainer-clean' target (bug #45574).

* doc/module.mk: Remove --build-dir option from octave.dvi and octave.pdf rules.
Add rules to doc-clean target to remove cache directiories created by texi2dvi
and texi2pdf.

* acinclude.m4: Use a different temporary build-dir for TEXI2DVI and TEXI2PDF
so that they can run in parallel without colliding.

diff -r f74ab65ee1bf -r 07ddaaeb9040 doc/module.mk
--- a/doc/module.mk	Mon Jul 20 18:31:52 2015 -0400
+++ b/doc/module.mk	Tue Jul 21 12:21:36 2015 -0700
@@ -252,13 +252,13 @@
 doc/interpreter/octave.dvi: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi | doc/interpreter/$(am__dirstamp)
 	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc/interpreter -I $(abs_top_srcdir)/doc/interpreter' \
-	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+	$(TEXI2DVI) $(AM_V_texinfo) -o $@ $(AM_V_texidevnull) \
 	`test -f 'doc/interpreter/octave.texi' || echo '$(abs_top_srcdir)/'`doc/interpreter/octave.texi
 
 doc/interpreter/octave.pdf: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi | doc/interpreter/$(am__dirstamp)
 	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc/interpreter -I $(abs_top_srcdir)/doc/interpreter' \
-	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+	$(TEXI2PDF) $(AM_V_texinfo) -o $@ $(AM_V_texidevnull) \
 	`test -f 'doc/interpreter/octave.texi' || echo '$(abs_top_srcdir)/'`doc/interpreter/octave.texi
 
 $(OCTAVE_HTML_STAMP): doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi | doc/interpreter/$(am__dirstamp)
@@ -295,11 +295,6 @@
   doc/interpreter/octave.html \
   $(HTMLDIR_IMAGES)
 
-## The texi2dvi script (used to create both PDF and DVI output formats)
-## uses some fixed temporary file names.  In order to avoid a race condition
-## the DVI and PDF builds are forced to run serially through a Makefile rule.
-#doc/interpreter/octave.pdf: doc/interpreter/octave.dvi
-
 # Prevent packaging of distribution unless all libraries
 # necessary to create documentation are present
 doc-interpreter-dist-hook:
@@ -541,6 +536,8 @@
 
 doc-clean:
 	rm -f $(doc_CLEANFILES)
+	rm -rf $(top_builddir)/.t2d.cache
+	rm -rf $(top_builddir)/.t2p.cache
 
 doc-distclean: doc-clean
 	rm -f $(doc_DISTCLEANFILES)
diff -r f74ab65ee1bf -r 07ddaaeb9040 m4/acinclude.m4
--- a/m4/acinclude.m4	Mon Jul 20 18:31:52 2015 -0400
+++ b/m4/acinclude.m4	Tue Jul 21 12:21:36 2015 -0700
@@ -2274,7 +2274,11 @@
 "
     OCTAVE_CONFIGURE_WARNING([warn_texi2dvi])
   fi
-  TEXI2DVI="$TEXI2DVI"' --build-dir=t2d_cache'
+dnl FIXME: texi2pdf and texi2dvi can not be run simultaneously as they both
+dnl        attempt to create a temporary build directory of the same name.
+dnl        A workaround is to define separate build directories for each
+dnl        command as is done here.
+  TEXI2DVI="$TEXI2DVI"' --build-dir=.t2d.cache'
   AC_SUBST(TEXI2DVI)
 ])
 dnl
@@ -2301,7 +2305,11 @@
 "
     OCTAVE_CONFIGURE_WARNING([warn_texi2pdf])
   fi
-  TEXI2PDF="$TEXI2PDF"' --build-dir=t2d_cache'
+dnl FIXME: texi2pdf and texi2dvi can not be run simultaneously as they both
+dnl        attempt to create a temporary build directory of the same name.
+dnl        A workaround is to define separate build directories for each
+dnl        command as is done here.
+  TEXI2PDF="$TEXI2PDF"' --build-dir=.t2p.cache'
   AC_SUBST(TEXI2PDF)
 ])
 dnl