[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 40/46: Do not use $< in non-suffix rules.
From: |
Bertrand Garrigues |
Subject: |
[groff] 40/46: Do not use $< in non-suffix rules. |
Date: |
Tue, 27 Jan 2015 22:59:34 +0000 |
bgarrigues pushed a commit to branch automake3
in repository groff.
commit 194b0d4d6a56a114655426c60c69126cef01ed01
Author: Ingo Schwarze <address@hidden>
Date: Wed Sep 17 00:22:01 2014 +0200
Do not use $< in non-suffix rules.
It is not portable but only works with GNU make.
---
doc/doc.am | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/doc/doc.am b/doc/doc.am
index 8c285e8..f2dccbb 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -21,12 +21,15 @@
doc_srcdir = $(abs_top_srcdir)/doc
doc_builddir = $(abs_top_builddir)/doc
-DOC_GROFF=\
- LANG=C LC_ALL=C \
- sed -e "s;@VERSION@;$(VERSION);" $< \
- | GROFF_COMMAND_PREFIX= \
- GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
- $(GROFFBIN) -I$(abs_top_builddir) -M $(doc_srcdir) $(TFLAG) $(FFLAG) -Upet
-ww
+DOC_SED = sed -e "s;@VERSION@;$(VERSION);"
+
+DOC_GROFF_ONLY=\
+ GROFF_COMMAND_PREFIX= \
+ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
+ $(GROFFBIN) -I$(abs_top_builddir) -M $(doc_srcdir) \
+ $(TFLAG) $(FFLAG) -Upet -ww
+
+DOC_GROFF = $(DOC_SED) $< | $(DOC_GROFF_ONLY)
# Other doc, installed in $(docdir)
if BUILD_OTHERDOC
@@ -135,8 +138,8 @@ doc/pic.html: $(dist_devpsfont_DATA)
$(nodist_devpsfont_DATA)
doc/pic.html: $(doc_srcdir)/pic.ms $(devhtmlfont_DATA)
@$(MKDIR_P) $(doc_builddir)
cd $(doc_builddir) && \
- $(DOC_GROFF) -P-p -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
+ $(DOC_SED) $(doc_srcdir)/pic.ms | \
+ $(DOC_GROFF_ONLY) -P-p -P-Ipic -P-D$(imagedir) -P-jpic \
-Thtml -P-V -ms > pic.html
doc/examples.stamp: doc/groff.css
@@ -150,8 +153,8 @@ doc/webpage.html: $(dist_devpsfont_DATA)
$(nodist_devpsfont_DATA)
doc/webpage.html: $(doc_srcdir)/webpage.ms gnu.eps $(doc_srcdir)/groff.css
@$(MKDIR_P) doc
cd $(doc_builddir) && \
- $(DOC_GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \
- -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
+ $(DOC_SED) $(doc_srcdir)/webpage.ms | \
+ $(DOC_GROFF_ONLY) -P-jwebpage -P-nrpb -P-Iwebpage \
-P-D$(imagedir) -Thtml -ms > webpage.html
doc/grnexmpl.ps: doc/grnexmpl.me doc/grnexmpl.g
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 40/46: Do not use $< in non-suffix rules.,
Bertrand Garrigues <=