aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/asciidoc.mk4
-rw-r--r--test/plugin_asciidoc.mk12
2 files changed, 11 insertions, 5 deletions
diff --git a/plugins/asciidoc.mk b/plugins/asciidoc.mk
index 5a40848..6253994 100644
--- a/plugins/asciidoc.mk
+++ b/plugins/asciidoc.mk
@@ -65,14 +65,14 @@ asciidoc-manual:: doc-deps
asciidoc-manual:: $(ASCIIDOC_MANUAL_FILES)
$(call erlang,$(call asciidoc2man.erl,$?))
- $(foreach s,$(MAN_SECTIONS),mkdir -p doc/man$s/ && mv doc/src/manual/*.$s.gz doc/man$s/)
+ $(foreach s,$(MAN_SECTIONS),mkdir -p doc/man$s/ && mv doc/src/manual/*.$s.gz doc/man$s/;)
install-docs:: install-asciidoc
install-asciidoc: asciidoc-manual
$(foreach s,$(MAN_SECTIONS),\
mkdir -p $(MAN_INSTALL_PATH)/man$s/ && \
- install -g `id -u` -o `id -g` -m 0644 doc/man$s/*.gz $(MAN_INSTALL_PATH)/man$s/)
+ install -g `id -u` -o `id -g` -m 0644 doc/man$s/*.gz $(MAN_INSTALL_PATH)/man$s/;)
distclean-asciidoc-manual:
$(gen_verbose) rm -rf $(addprefix doc/man,$(MAN_SECTIONS))
diff --git a/test/plugin_asciidoc.mk b/test/plugin_asciidoc.mk
index 8f20fae..62bda54 100644
--- a/test/plugin_asciidoc.mk
+++ b/test/plugin_asciidoc.mk
@@ -17,9 +17,6 @@ asciidoc-build: build clean
$i "Add asciideck to the local dependencies"
$t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = asciideck\n"}' $(APP)/Makefile
- $i "Only enable man pages section 3"
- $t perl -ni.bak -e 'print;if ($$.==1) {print "MAN_SECTIONS = 3\n"}' $(APP)/Makefile
-
$i "Run AsciiDoc"
$t $(MAKE) -C $(APP) asciidoc $v
@@ -27,6 +24,7 @@ asciidoc-build: build clean
$t test ! -e $(APP)/doc/guide.pdf
$t test ! -e $(APP)/doc/html/
$t test ! -e $(APP)/doc/man3/
+ $t test ! -e $(APP)/doc/man7/
$i "Generate AsciiDoc documentation"
$t mkdir -p $(APP)/doc/src/guide/ $(APP)/doc/src/manual/
@@ -39,6 +37,12 @@ asciidoc-build: build clean
"erlang_mk - Erlang.mk test" "" \
"== Description" "" \
"Hello world!" > $(APP)/doc/src/manual/erlang_mk.asciidoc
+ $t printf "%s\n" \
+ "= erlang_mk(7)" "" \
+ "== Name" "" \
+ "erlang_mk - Erlang.mk application" "" \
+ "== Description" "" \
+ "Summer is better than winter!" > $(APP)/doc/src/manual/erlang_mk_app.asciidoc
$i "Run AsciiDoc"
$t $(MAKE) -C $(APP) asciidoc $v
@@ -47,6 +51,7 @@ asciidoc-build: build clean
$t test -f $(APP)/doc/guide.pdf
$t test -d $(APP)/doc/html/
$t test -f $(APP)/doc/man3/erlang_mk.3.gz
+ $t test -f $(APP)/doc/man7/erlang_mk.7.gz
$i "Distclean the application"
$t $(MAKE) -C $(APP) distclean $v
@@ -55,6 +60,7 @@ asciidoc-build: build clean
$t test ! -e $(APP)/doc/guide.pdf
$t test ! -e $(APP)/doc/html/
$t test ! -e $(APP)/doc/man3/
+ $t test ! -e $(APP)/doc/man7/
$i "Generate an invalid AsciiDoc file"
$t printf "%s\n" \