From 4d50ed111ad4f3172c4c186a2ca19b638c709a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= <p@janouch.name>
Date: Sun, 25 Sep 2022 21:01:34 +0200
Subject: [PATCH] Bump liberty, make use of its new asciiman.awk

---
 CMakeLists.txt | 10 +++++++++-
 README.adoc    |  4 ++--
 liberty        |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d841c2..d316c15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 ()
 
diff --git a/README.adoc b/README.adoc
index e8ffc44..3c09ba7 100644
--- a/README.adoc
+++ b/README.adoc
@@ -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) +
diff --git a/liberty b/liberty
index 22a1213..34460ca 160000
--- a/liberty
+++ b/liberty
@@ -1 +1 @@
-Subproject commit 22a121383f73fa7739f324021b6ad0ba6ed3cdb3
+Subproject commit 34460ca715b295cc73c3f2bba4156c7f072ce122