From 5ed6f6ce11f0480544f2878518afd24785eb2721 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 29 Nov 2018 10:42:34 +0100 Subject: doc/manuals: integrate into this repository Update .gitignore and make the manuals build without a toplevel configure.ac file from autotools: $ cd doc/manuals $ make Related: OS#3385 Change-Id: I5916bc7e656b508fc74917e79841ce7e1ee4981b --- doc/manuals/Makefile | 8 ++++++++ doc/manuals/Makefile.am | 10 ---------- doc/manuals/osmo-gsm-manuals-dir.sh | 26 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 doc/manuals/Makefile delete mode 100644 doc/manuals/Makefile.am create mode 100755 doc/manuals/osmo-gsm-manuals-dir.sh (limited to 'doc') diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile new file mode 100644 index 0000000..0730411 --- /dev/null +++ b/doc/manuals/Makefile @@ -0,0 +1,8 @@ +OSMO_GSM_MANUALS_DIR := $(shell ./osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) + +ASCIIDOC = osmo-gsm-tester-manual.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am deleted file mode 100644 index 4301ab9..0000000 --- a/doc/manuals/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmo-gsm-tester-manual.adoc \ - osmo-gsm-tester-manual-docinfo.xml \ - chapters - -ASCIIDOC = osmo-gsm-tester-manual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/doc/manuals/osmo-gsm-manuals-dir.sh b/doc/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 0000000..f132eaa --- /dev/null +++ b/doc/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- cgit v1.2.3