[gnuastro-commits] (no subject)

[Mohammad Akhlaghi]

branch: master
commit 5d8967c32d4cb0fab397dd4cebfdafc9128648a6
Author: Mohammad Akhlaghi <address@hidden>
Date:   Mon May 23 19:18:47 2016 +0900

    Better workaround for fdl.texi
    
    The previous work-around for `fdl.texi' could cause big problems when
    Automake was ran outside of the `bootstrap' script. For a more reliable
    workaround, we are now using the `AM_V_texinfo' variable. This variable
    appears to have been defined for verbosity, but since it isn't a
    significant issue (at least compared to this), we have replaced it with
    this necessary flag.
    
    Later (when Autoconf's bug #23599) is fixed, we can remove this definition
    entirely, since `AM_MAKEINFOFLAGS' should be enough. But until then, we
    will need to use this working alternative.
---
 bootstrap.conf  |    6 ------
 configure.ac    |   10 ----------
 doc/Makefile.am |   23 ++++++++++++++++++-----
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 75bfe00..4ddf48f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -134,12 +134,6 @@ bootstrap_post_import_hook()
 # operations are complete.
 bootstrap_epilogue()
 {
-  # This is a temporary work-around to the problem of not being able to
-  # override the value of TEXI2DVI in doc/Makefile.am.
-  sed 's/TEXI2DVI = texi2dvi/TEXI2DVI = texi2dvi -I $(BOOTSTRPDOC)/'  \
-      doc/Makefile.in > doc/Makefile.in.tmp
-  mv doc/Makefile.in.tmp doc/Makefile.in
-
   # Prepare all the figure formats for the various manual formats.
   cd doc/plotsrc
   make
diff --git a/configure.ac b/configure.ac
index ddca1cf..86acd83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,16 +117,6 @@ AC_PATH_PROG(HELP2MAN, help2man)
 
 
 
-# Path of the bootstrapped/doc dir to use for finding fdl.texi (which comes
-# from Gnulib). IMPORTANT NOTE: the `'' signs are needed on either side of
-# the value, otherwise the `$(top_srcdir)' will be executed at configure
-# time and be blank by the time it reaches Make.
-AC_SUBST(BOOTSTRPDOC, ['$(top_srcdir)/bootstrapped/doc'])
-
-
-
-
-
 # Read the configuration date.
 AC_MSG_CHECKING([for date of compilation])
 AC_DEFINE_UNQUOTED([CONFIGDATE], ["`date +"%d %B %Y"`"],
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 089e8c8..00dd969 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -32,14 +32,27 @@ SHELL=/bin/bash
 ## directory. However, it is needed by gnuastro.texi to build the
 ## documentation. It is the job of AM_MAKEINFOFLAGS, to pass options to the
 ## documentation build programs. BOOTSTRPDOC is defined in `configure.ac'.
-AM_MAKEINFOFLAGS = -I $(BOOTSTRPDOC)
-#TEXI2DVI = texi2dvi -I $(BOOTSTRPDOC)
+bootstrpdoc = $(top_srcdir)/bootstrapped/doc
+AM_MAKEINFOFLAGS = -I $(bootstrpdoc)
 
 
-## Commands to make the texinfo tools. BOOTSTRPDOC is defined in
-## `configure.ac'.
+# This is just a temporary work-around since Automake does not pass the
+# AM_MAKEINFOFLAGS to texi2dvi (which builds DVI and PDF outputs). This was
+# reported in Automake's bug 23599. A better way than the solution below
+# would have been to add the flags to the TEXI2DVI variable like this:
+#
+#    TEXI2DVI = texi2dvi -I $(bootstrpdoc)
+#
+# However, strangely, Automake doesn't allow us to override the value of
+# TEXI2DVI! So the only remaining tool that can be used to pass this
+# include directive to texi2dvi is the AM_V_texinfo. It appears it was
+# there to limit verbosity, but for the time being we are using it here.
+AM_V_texinfo = -I $(bootstrpdoc)
+
+
+## Commands to make the texinfo tools.
 info_TEXINFOS = gnuastro.texi
-gnuastro_TEXINFOS = $(BOOTSTRPDOC)/fdl.texi formath.texi authors.texi
+gnuastro_TEXINFOS = $(bootstrpdoc)/fdl.texi formath.texi authors.texi
 
 
 ## Files not predefined by Automake, and not in dependencies that must