[PATCH] Documentation/Makefile: make AsciiDoc dblatex dir configurable

John Keeping· Oct 3, 2013, 19:17 UTC · lore

On my system this is in /usr/share/asciidoc/dblatex not /etc/asciidoc/dblatex. Extract this portion of the path to a variable so that is can be set in config.mak.

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 Documentation/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Show changes to Documentation/Makefile +2 −1

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 0cfdc36..4f13a23 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -103,6 +103,7 @@ MAKEINFO = makeinfo
 INSTALL_INFO = install-info
 DOCBOOK2X_TEXI = docbook2x-texi
 DBLATEX = dblatex
+ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
 ifndef PERL_PATH
 	PERL_PATH = /usr/bin/perl
 endif
@@ -354,7 +355,7 @@ user-manual.texi: user-manual.xml
 
 user-manual.pdf: user-manual.xml
 	$(QUIET_DBLATEX)$(RM) $@+ $@ && \
-	$(DBLATEX) -o $@+ -p /etc/asciidoc/dblatex/asciidoc-dblatex.xsl -s /etc/asciidoc/dblatex/asciidoc-dblatex.sty $< && \
+	$(DBLATEX) -o $@+ -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty $< && \
 	mv $@+ $@
 
 gitman.texi: $(MAN_XML) cat-texi.perl

-- 
1.8.4.566.g73d370b

Jonathan Nieder· Oct 3, 2013, 19:20 UTC · re: John Keeping · lore

Re: [PATCH] Documentation/Makefile: make AsciiDoc dblatex dir configurable

John Keeping wrote:

Show 5 quoted lines

> On my system this is in /usr/share/asciidoc/dblatex not
> /etc/asciidoc/dblatex.  Extract this portion of the path to a variable
> so that is can be set in config.mak.
>
> Signed-off-by: John Keeping <john@keeping.me.uk>

Thanks.  Looks good.

Miklos Vajna· Oct 4, 2013, 05:43 UTC · re: John Keeping · lore

Re: [PATCH] Documentation/Makefile: make AsciiDoc dblatex dir configurable

On Thu, Oct 03, 2013 at 08:17:32PM +0100, John Keeping <john@keeping.me.uk> wrote:

> On my system this is in /usr/share/asciidoc/dblatex not
> /etc/asciidoc/dblatex.  Extract this portion of the path to a variable
> so that is can be set in config.mak.

Sure, makes sense.

patchDocumentation/Makefile: make AsciiDoc dblatex dir configurable