Use configure-time path for literate-xsl over submodule
The submodule is inconvenient and requires awkward project updates for changes that might be frequent (as it is developed alongside this project). If we become worried about BC breaks, then we'll do a version check.master
parent
a2a34ba19a
commit
4199b989b3
|
@ -17,3 +17,7 @@ Makefile
|
|||
/tools/missing
|
||||
/tools/mdate-sh
|
||||
/tools/texinfo.tex
|
||||
|
||||
# tools we use (default paths)
|
||||
/tools/literate-xsl
|
||||
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
[submodule "tools/xspec"]
|
||||
path = tools/xspec
|
||||
url = https://github.com/lovullo/xspec
|
||||
[submodule "tools/xsltexi"]
|
||||
path = tools/xsltexi
|
||||
url = https://github.com/lovullo/xsltexi
|
||||
|
|
|
@ -23,6 +23,14 @@ AM_INIT_AUTOMAKE([foreign])
|
|||
AC_ARG_VAR([JAVA], [The Java executable])
|
||||
AC_CHECK_PROGS(JAVA, [java])
|
||||
|
||||
: ${LITERATE_XSL=tools/literate-xsl}
|
||||
AC_ARG_VAR([LITERATE_XSL], [Path to literate-xsl])
|
||||
|
||||
AC_MSG_CHECKING([literate-xsl path LITERATE_XSL=$LITERATE_XSL])
|
||||
AS_IF(test ! -f "$LITERATE_XSL/src/texinfo.xsl",
|
||||
AC_MSG_ERROR([literate-xsl was not found in path '$LITERATE_XSL'!]))
|
||||
AC_MSG_RESULT(done)
|
||||
|
||||
AC_CONFIG_FILES([Makefile doc/Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -20,8 +20,7 @@
|
|||
|
||||
.DELETE_ON_ERROR:
|
||||
|
||||
path_src := ../src
|
||||
path_tools := ../tools
|
||||
path_src := ../src
|
||||
|
||||
stylesheets := $(shell find "$(path_src)" -name '*.xsl')
|
||||
stexi := $(stylesheets:.xsl=.texi)
|
||||
|
@ -34,7 +33,7 @@ MAKEINFOHTML=$(MAKEINFO) --html
|
|||
xsltexis: $(stexi)
|
||||
%.texi: %.xsl
|
||||
$(JAVA) -jar "$(SAXON_CP)" \
|
||||
-xsl:"$(path_tools)/xsltexi/src/xsltexi.xsl" \
|
||||
-xsl:"$(top_builddir)/@LITERATE_XSL@/src/texinfo.xsl" \
|
||||
"$<" > "$@"
|
||||
|
||||
clean-local:
|
||||
|
|
Loading…
Reference in New Issue