summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/Makefile.vty-reference.inc1
-rwxr-xr-xbuild/vty_reference_combine.sh12
2 files changed, 9 insertions, 4 deletions
diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc
index af5388c..cb00648 100644
--- a/build/Makefile.vty-reference.inc
+++ b/build/Makefile.vty-reference.inc
@@ -37,6 +37,7 @@ generated/docbook_vty.xml: \
$(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \
$(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl
$(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \
+ $(srcdir)/vty/*reference.xml \
$(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \
vty/*additions*.xml
xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \
diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh
index be234a7..cb18e9e 100755
--- a/build/vty_reference_combine.sh
+++ b/build/vty_reference_combine.sh
@@ -1,16 +1,20 @@
#!/bin/sh
+# usage: vty_reference_combine.sh path/to/merge_doc.xsl path/to/*reference.xml [paths to additional xmls]
+# see Makefile.vty-reference.inc
set -e
-# the first argument should point at libosmocore/doc/vty/merge_doc.xsl
+# first argument: merge_doc.xsl
MERGE_DOC="$1"
shift
+# second argument: *reference.xml
+reference="$1"
+test "$(ls -1 $reference | wc -l)" = "1"
+shift
+
combined="generated/combined.xml"
combine_src="generated/combine_src.xml"
-reference="vty/*reference.xml"
-test "$(ls -1 $reference | wc -l)" = "1"
-
set -x
mkdir -p generated
cp $reference "$combined"