From 8d282762d9948d222c8f961434fc04a8c7478d74 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 16 Nov 2018 12:39:59 +0100 Subject: [PATCH] cosmetic: update usage of OSMO_GSM_MANUALS_DIR OSMO_GSM_MANUALS_DIR should use pkg-config to figure out the location of the shared osmo-gsm-manuals files. (moving manuals to project repositories 6/19) Related: OS#3385 Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 --- build/Makefile.asciidoc.inc | 4 +++- build/Makefile.docbook.inc | 4 +++- build/Makefile.vty-reference.inc | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 2cd7d50..18cfa88 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -1,6 +1,8 @@ # USAGE: # -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define in 'ASCIIDOC' all root .adoc files, # - optionally define in 'ASCIIDOC_DEPS' all dependencies common to all .adocs, # - include this file, diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index acf410e..b69fcea 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -1,6 +1,8 @@ # USAGE: # -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define in 'DOCBOOKS' all root .xml files, # - optionally define in 'DOCBOOKS_DEPS' all dependencies common to all .xmls, # - include this file, diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 659f26c..af5388c 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -7,8 +7,10 @@ # - vty/*_reference.xml # Export from VTY 'show online-help', exactly one file. # -# In your Makefile, -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# In your Makefile.am, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define the (single) name of the vty-reference source in VTY_REFERENCE, # - include this file. #