[groff] 01/01: Revert "Makefile.am: Stop passing pdfmom unneeded flags."

[Ingo Schwarze]

schwarze pushed a commit to branch master
in repository groff.

commit 76f4131a923cceaba1b3867cee62518e9580e996
Author: Ingo Schwarze <address@hidden>
Date:   Sat Jan 13 04:15:59 2018 +0100

    Revert "Makefile.am: Stop passing pdfmom unneeded flags."
    
    * Makefile.am: Re-add -F and -M flags needed to build out of src.
    
    This reverts commit 4b34b4f0f52e7631b417e3673bcaf9a08def84fa
    and adds a comment to prevent the same error from occurring again.
    
    That commit broke the build process "./bootstrap; mkdir build; cd build;
    ../configure; make" which is documented in the file INSTALL.REPO
    because build/font/devps/ does not contain all required files and
    the files in font/devps/ are needed for the build, too.
    
    OK gbranden PTPi
---
 ChangeLog   | 4 ++++
 Makefile.am | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e574fba..c674bc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-01-13  Ingo Schwarze <address@hidden>
 
+       Makefile.am: Re-add -F and -M flags needed to build out of src.
+
+2018-01-13  Ingo Schwarze <address@hidden>
+
        [mdoc]: rewrite the implementation of the .Lk macro
 
        * tmac/doc.tmac-u (Lk): Rewrite.
diff --git a/Makefile.am b/Makefile.am
index 6232f55..4cd4cf0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -608,8 +608,9 @@ endif
 GROFFBIN = $(abs_top_builddir)/groff
 GROFF_BIN_PATH = $(abs_top_builddir)
 PDFMOMBIN = $(abs_top_builddir)/pdfmom
-FFLAG=-F$(abs_top_builddir)/font
-TFLAG=-M$(abs_top_builddir)/tmac
+# The second directories are needed for the case "cd build; ../configure".
+FFLAG=-F$(abs_top_builddir)/font -F$(abs_top_srcdir)/font
+TFLAG=-M$(abs_top_builddir)/tmac -M$(abs_top_srcdir)/tmac
 
 # make builtin variable RM
 if MAKE_DONT_HAVE_RM