groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 06/11: doc/doc.am: Drop unnecessary groff -I options.


From: G. Branden Robinson
Subject: [groff] 06/11: doc/doc.am: Drop unnecessary groff -I options.
Date: Wed, 6 Apr 2022 13:08:21 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit c81db845dab63132bc7a2d8e254a7aeb25c8913f
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Apr 6 04:25:47 2022 +1000

    doc/doc.am: Drop unnecessary groff -I options.
    
    * doc/doc.am: Drop unnecessary `-I` options to groff.
    
      (DOC_GROFF): There is no need to look at the top of the build
      directory for any file inclusions.
    
      (doc/webpage.html): There is no need to look in `doc_builddir` for
      file inclusions, since that is the current working directory when
      "webpage.ms" is processed.
---
 ChangeLog  |  9 +++++++++
 doc/doc.am | 13 ++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cac62224..7f845fa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-04-06  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * doc/doc.am: Drop unnecessary `-I` options to groff.
+       (DOC_GROFF): There is no need to look at the top of the build
+       directory for any file inclusions.
+       (doc/webpage.html): There is no need to look in `doc_builddir`
+       for file inclusions, since that is the current working directory
+       when "webpage.ms" is processed.
+
 2022-04-06  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/doc.am: Trivially refactor.  Use `RM` macro idiomatically.
diff --git a/doc/doc.am b/doc/doc.am
index 3bcdabfd..9a6ba364 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -36,8 +36,7 @@ DOC_SED = $(SED) \
 DOC_GROFF=\
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
-  $(GROFFBIN) -I$(abs_top_builddir) -M $(doc_srcdir) $(TFLAG) $(FFLAG) \
-    -ww -b
+  $(GROFFBIN) -M $(doc_srcdir) $(TFLAG) $(FFLAG) -ww -b
 
 # This image file is used by several documents in the groff source tree.
 DOC_GNU_EPS=doc/gnu.eps
@@ -344,9 +343,9 @@ doc/webpage.html: $(DOC_GNU_EPS) $(doc_srcdir)/groff.css
 doc/webpage.html: $(doc_srcdir)/webpage.ms
        $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
        && cd $(doc_builddir) \
-       && $(DOC_GROFF) -t -I $(doc_builddir) -I $(doc_srcdir) \
-         -P-jwebpage -P-nrb -P-Iwebpage -P-Dimg -Thtml -ms \
-         $(doc_srcdir)/webpage.ms > webpage.html
+       && $(DOC_GROFF) -t -I $(doc_srcdir) -P-jwebpage -P-nrb \
+         -P-Iwebpage -P-Dimg -Thtml -ms $(doc_srcdir)/webpage.ms \
+         > webpage.html
 
 # We remove groff.css only from an out-of-source build tree.
 mostlyclean-local: mostlyclean_doc
@@ -502,7 +501,7 @@ doc/groff.info: $(doc_srcdir)/groff.texi
        $(AM_V_GEN)LANG=C \
        LC_ALL=C \
        $(MAKEINFO) -o doc/groff.info --enable-encoding \
-         -I$(doc_srcdir) $(doc_srcdir)/groff.texi
+         -I $(doc_srcdir) $(doc_srcdir)/groff.texi
 
 # Distribute the Info files.
 dist-hook: dist-info-bits
@@ -521,7 +520,7 @@ MAINTAINERCLEANFILES += doc/groff.txt
        $(AM_V_at)$(MKDIR_P) $(doc_builddir)
        $(AM_V_GEN)LANG=C \
        LC_ALL=C \
-       $(MAKEINFO) --enable-encoding -I$(doc_srcdir) --plaintext \
+       $(MAKEINFO) --enable-encoding -I $(doc_srcdir) --plaintext \
          -o $@ $<
 
 # Generate HTML, both split into several files, and as a single file.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]