Bump liberty, make use of its new asciiman.awk
This commit is contained in:
parent
e15c9cba43
commit
4d50ed111a
@ -234,7 +234,8 @@ install (DIRECTORY plugins/xC/
|
||||
find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor)
|
||||
find_program (A2X_EXECUTABLE a2x)
|
||||
if (NOT ASCIIDOCTOR_EXECUTABLE AND NOT A2X_EXECUTABLE)
|
||||
message (FATAL_ERROR "Neither asciidoctor nor a2x were found")
|
||||
message (WARNING "Neither asciidoctor nor a2x were found, "
|
||||
"falling back to a substandard manual page generator")
|
||||
endif ()
|
||||
|
||||
foreach (page xB xC xD)
|
||||
@ -256,6 +257,13 @@ foreach (page xB xC xD)
|
||||
"${PROJECT_SOURCE_DIR}/${page}.adoc"
|
||||
DEPENDS ${page}.adoc
|
||||
COMMENT "Generating man page for ${page}" VERBATIM)
|
||||
else ()
|
||||
set (ASCIIMAN ${PROJECT_SOURCE_DIR}/liberty/tools/asciiman.awk)
|
||||
add_custom_command (OUTPUT ${page_output}
|
||||
COMMAND env LC_ALL=C awk -f ${ASCIIMAN}
|
||||
"${PROJECT_SOURCE_DIR}/${page}.adoc" > ${page_output}
|
||||
DEPENDS ${page}.adoc ${ASCIIMAN}
|
||||
COMMENT "Generating man page for ${page}" VERBATIM)
|
||||
endif ()
|
||||
endforeach ()
|
||||
|
||||
|
@ -68,8 +68,8 @@ a package with the latest development version from Archlinux's AUR.
|
||||
|
||||
Building
|
||||
--------
|
||||
Build-only dependencies:
|
||||
CMake, pkg-config, asciidoctor or asciidoc, awk, liberty (included) +
|
||||
Build-only dependencies: CMake, pkg-config, awk, liberty (included),
|
||||
asciidoctor or asciidoc (recommended but optional) +
|
||||
Common runtime dependencies: openssl +
|
||||
Additionally for 'xC': curses, libffi, readline >= 6.0 or libedit >= 2013-07-12,
|
||||
lua >= 5.3 (optional) +
|
||||
|
2
liberty
2
liberty
@ -1 +1 @@
|
||||
Subproject commit 22a121383f73fa7739f324021b6ad0ba6ed3cdb3
|
||||
Subproject commit 34460ca715b295cc73c3f2bba4156c7f072ce122
|
Loading…
Reference in New Issue
Block a user