From e5c385fbc041f6cab4c32668027719a2b0e6d7ab Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 14 Nov 2018 10:47:01 +0100 Subject: [PATCH] build manuals moved here from osmo-gsm-manuals.git Moved to doc/manuals/, with full commit history, in preceding merge commit. Now incorporate in the build system. Build with: $ autoreconf -fi $ ./configure --enable-manuals $ make Shared files from osmo-gsm-manuals.git are found automatically if - the repository is checked out in ../osmo-gsm-manuals; or - if it osmo-gsm-manuals was installed with "make install"; or - OSMO_GSM_MANUALS_DIR is set. Related: OS#3385 Change-Id: I7d1226d3865da9595b730b716a8d4ba07be1e0d5 --- doc/manuals/Makefile | 7 ------- doc/manuals/Makefile.am | 10 ++++++++++ doc/manuals/osmocombb-usermanual.adoc | 16 ++++++++-------- 3 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 doc/manuals/Makefile create mode 100644 doc/manuals/Makefile.am diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile deleted file mode 100644 index 9f861a567..000000000 --- a/doc/manuals/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -TOPDIR = .. - -ASCIIDOC = osmocombb-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc - -include $(TOPDIR)/build/Makefile.common.inc diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am new file mode 100644 index 000000000..61ccafab8 --- /dev/null +++ b/doc/manuals/Makefile.am @@ -0,0 +1,10 @@ +OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmocombb-usermanual.adoc \ + osmocombb-usermanual-docinfo.xml \ + chapters + +ASCIIDOC = osmocombb-usermanual.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/osmocombb-usermanual.adoc b/doc/manuals/osmocombb-usermanual.adoc index b40593482..024fc79ab 100644 --- a/doc/manuals/osmocombb-usermanual.adoc +++ b/doc/manuals/osmocombb-usermanual.adoc @@ -3,19 +3,19 @@ OsmocomBB User Manual Holger Hans Peter Freyther -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] -include::chapters/scripting.adoc[] +include::{srcdir}/chapters/scripting.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[]