diff options
author | mrpa <miruna.paun@enea.com> | 2021-04-09 10:45:40 +0200 |
---|---|---|
committer | Miruna Paun <mrpa@enea.se> | 2021-04-09 11:48:15 +0100 |
commit | 43021dae86481d75899c7e512f6d2f9cd9dce48a (patch) | |
tree | d528b0979bb9bf8099113671dca050b2d8fd9ba9 /doc/Makefile | |
parent | 722fc206fafbc809f6b664fa403e06fd2b12591b (diff) | |
parent | 13dbb438ecad3d66173994a2f300497a6d9d15c0 (diff) | |
download | nfv-access-documentation-43021dae86481d75899c7e512f6d2f9cd9dce48a.tar.gz |
Merge the code from develop to master for 2.4.0Enea_NFV_Access_2.4.0hotfix_EDGESC-6feature_CPDX-3546EE240_HotFix1
Change-Id: Ibc844e001b7d75125d6006fa5333cc65bbf5afa4
Diffstat (limited to 'doc/Makefile')
-rw-r--r-- | doc/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/Makefile b/doc/Makefile index 024d6ca..9621b72 100644 --- a/doc/Makefile +++ b/doc/Makefile | |||
@@ -23,13 +23,13 @@ include init.mk | |||
23 | 23 | ||
24 | 24 | ||
25 | # ******************* AutoGenerated chapters from template and target READMEs ******* | 25 | # ******************* AutoGenerated chapters from template and target READMEs ******* |
26 | #BUILDBOOT_XML := book-enea-nfv-access-release-info/doc/build_boot_generated.xml | 26 | #BUILDBOOT_XML := book-enea-edge-release-info/doc/build_boot_generated.xml |
27 | #BUILDBOOT_TEMPLATE := book-enea-nfv-access-release-info/doc/build_boot_template.xml | 27 | #BUILDBOOT_TEMPLATE := book-enea-edge-release-info/doc/build_boot_template.xml |
28 | 28 | ||
29 | PKGDIFF_GEN_XML := book-enea-nfv-access-release-info/doc/pkgdiff_generated.xml | 29 | #PKGDIFF_GEN_XML := book-enea-edge-release-info/doc/pkgdiff_generated.xml |
30 | JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generated.xml | 30 | #JIRA_ISSUES_GEN_XML := book-enea-edge-release-info/doc/jiraissues_generated.xml |
31 | 31 | ||
32 | MACHINE_LIST_XML := book-enea-nfv-access-release-info/doc/machine_list_generated.xml | 32 | MACHINE_LIST_XML := book-enea-edge-release-info/doc/machine_list_generated.xml |
33 | 33 | ||
34 | ELTF_PARAMS_TEMPLATE := s_doceneacommon/doc/eltf_params_template.xml | 34 | ELTF_PARAMS_TEMPLATE := s_doceneacommon/doc/eltf_params_template.xml |
35 | ELTF_PARAMS_UPDATED := s_doceneacommon/doc/eltf_params_updated.xml | 35 | ELTF_PARAMS_UPDATED := s_doceneacommon/doc/eltf_params_updated.xml |
@@ -50,7 +50,7 @@ DOCBOOK_TO_BOOKDIR ?= yes | |||
50 | DOCBOOK_CLEANTMP ?= yes | 50 | DOCBOOK_CLEANTMP ?= yes |
51 | 51 | ||
52 | #Components (books) in this subsystem. Now use all books found here | 52 | #Components (books) in this subsystem. Now use all books found here |
53 | COMPONENTS := book-enea-nfv-access-auto-fw-th-open-source book-enea-nfv-access-auto-fw-th-user-guide book-enea-nfv-access-cmc-example-usecases book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-platform-open-source book-enea-nfv-access-getting-started book-enea-nfv-access-ucpem-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-evalkit | 53 | COMPONENTS := book-enea-edge-auto-fw-th-open-source book-enea-edge-auto-fw-th-user-guide book-enea-nfv-access-evalkit book-enea-edge-example-usecases book-enea-edge-getting-started book-enea-edge-runtime-open-source book-enea-edge-release-info book-enea-edge-system-test-specification book-enea-edge-telemetry-open-source book-enea-edge-management-open-source |
54 | 54 | ||
55 | 55 | ||
56 | # -------------------------------------------------------------- | 56 | # -------------------------------------------------------------- |
@@ -184,7 +184,7 @@ endif | |||
184 | books: init | 184 | books: init |
185 | # BOOKPACKAGES is defined in all book-*/swcomp.mk | 185 | # BOOKPACKAGES is defined in all book-*/swcomp.mk |
186 | $(VERB)DISTRO_VERSION=`egrep '"EneaLinux_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; BUILD_NUMBER=`egrep '"ENA_BUILD_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \ | 186 | $(VERB)DISTRO_VERSION=`egrep '"EneaLinux_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; BUILD_NUMBER=`egrep '"ENA_BUILD_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \ |
187 | BOOKVER="Enea NFV Access-$$DISTRO_VERSION-build-$$BUILD_NUMBER"; \ | 187 | BOOKVER="Enea Edge-$$DISTRO_VERSION-build-$$BUILD_NUMBER"; \ |
188 | for book in $(BOOKPACKAGES); do \ | 188 | for book in $(BOOKPACKAGES); do \ |
189 | for format in $(FORMAT); do \ | 189 | for format in $(FORMAT); do \ |
190 | $(MAKE) -f $(DOCBOOKMAKE)/make_docbook_standalone.mk BOOK=$$book FORMAT=$$format BOOK_VER="$$BOOKVER" books || exit 10; \ | 190 | $(MAKE) -f $(DOCBOOKMAKE)/make_docbook_standalone.mk BOOK=$$book FORMAT=$$format BOOK_VER="$$BOOKVER" books || exit 10; \ |