diff options
-rw-r--r-- | doc/Makefile | 2 | ||||
-rw-r--r-- | doc/book-enea-linux-release-info/doc/prerequisites.xml | 2 | ||||
-rw-r--r-- | doc/init.mk | 16 |
3 files changed, 11 insertions, 9 deletions
diff --git a/doc/Makefile b/doc/Makefile index 7982e0c..0b23b4f 100644 --- a/doc/Makefile +++ b/doc/Makefile | |||
@@ -143,7 +143,7 @@ ifeq ($(DOCBOOK_TOOLS_VERSIONS),yes) | |||
143 | endif | 143 | endif |
144 | 144 | ||
145 | # We rely on make doing these in order left to right | 145 | # We rely on make doing these in order left to right |
146 | init: initbuild initmanifest inittargets initpardoc initbuildboot initpkgdiff initissues | 146 | init: initbuild initcommon initmanifest initpardoc initbuildboot initpkgdiff initissues |
147 | pullall: pullbuild | 147 | pullall: pullbuild |
148 | 148 | ||
149 | # If no COMP, iterate over books-* in COMPONENTS with make doc | 149 | # If no COMP, iterate over books-* in COMPONENTS with make doc |
diff --git a/doc/book-enea-linux-release-info/doc/prerequisites.xml b/doc/book-enea-linux-release-info/doc/prerequisites.xml index 197a48a..fb2d208 100644 --- a/doc/book-enea-linux-release-info/doc/prerequisites.xml +++ b/doc/book-enea-linux-release-info/doc/prerequisites.xml | |||
@@ -4,7 +4,7 @@ | |||
4 | <chapter id="prerequisites"> | 4 | <chapter id="prerequisites"> |
5 | <title>Prerequisites</title> | 5 | <title>Prerequisites</title> |
6 | 6 | ||
7 | <xi:include href="system_requirements.xml" | 7 | <xi:include href="../../s_doceneacommon/doc/system_requirements.xml" |
8 | xmlns:xi="http://www.w3.org/2001/XInclude" /> | 8 | xmlns:xi="http://www.w3.org/2001/XInclude" /> |
9 | 9 | ||
10 | <para>Building Enea Linux or compiling applications requires that your git | 10 | <para>Building Enea Linux or compiling applications requires that your git |
diff --git a/doc/init.mk b/doc/init.mk index 587542f..7dc5efd 100644 --- a/doc/init.mk +++ b/doc/init.mk | |||
@@ -2,7 +2,9 @@ | |||
2 | # and should have targets init: s_docbuild and optional initcommon: s_doceneacommon | 2 | # and should have targets init: s_docbuild and optional initcommon: s_doceneacommon |
3 | # Typically let doc: depend on init and initcommon inside Makefile | 3 | # Typically let doc: depend on init and initcommon inside Makefile |
4 | # Manually optionally set GLOBALTMPCLONEROOT to yes or to a parent dir for tmpcommon | 4 | # Manually optionally set GLOBALTMPCLONEROOT to yes or to a parent dir for tmpcommon |
5 | # This init.mk file ver R1.00/2016-04-29 | 5 | # This init.mk file ver |
6 | # R1.00/2016-04-29 | ||
7 | # R2.00/2017-03-30 changed linux/documentation.git and it's old branch to linux/el_releases-common.git and it's new branch | ||
6 | 8 | ||
7 | ifeq ($(VERBOSE),yes) | 9 | ifeq ($(VERBOSE),yes) |
8 | VERB := | 10 | VERB := |
@@ -13,13 +15,13 @@ endif | |||
13 | #Git repositories to be cloned | 15 | #Git repositories to be cloned |
14 | REPO_DOCBUILD := build/docbuild.git | 16 | REPO_DOCBUILD := build/docbuild.git |
15 | NAME_DOCBUILD := docbuild | 17 | NAME_DOCBUILD := docbuild |
16 | REPO_DOCENEACOMMON := linux/documentation.git | 18 | REPO_DOCENEACOMMON := linux/el_releases-common.git |
17 | NAME_DOCENEACOMMON := doceneacommon | 19 | NAME_DOCENEACOMMON := doceneacommon |
18 | 20 | ||
19 | # Set nondefault BRANCH_DOCENEACOMMON in Makefile | 21 | # Set nondefault BRANCH_DOCENEACOMMON in Makefile |
20 | BRANCH_DOCENEACOMMON ?= master-enea | 22 | BRANCH_DOCENEACOMMON ?= master |
21 | # Separate clones of documentation.git with different branches, needed if cloned globally with risk that different distros can be at same place | 23 | # Separate clones of el_releases-common.git with different branches, needed if cloned globally with risk that different distros can be at same place |
22 | ifneq ($(BRANCH_DOCENEACOMMON),master-enea) | 24 | ifneq ($(BRANCH_DOCENEACOMMON),master) |
23 | NAME_DOCENEACOMMON := doceneacommon_$(BRANCH_DOCENEACOMMON) | 25 | NAME_DOCENEACOMMON := doceneacommon_$(BRANCH_DOCENEACOMMON) |
24 | endif | 26 | endif |
25 | 27 | ||
@@ -43,11 +45,11 @@ endif | |||
43 | 45 | ||
44 | usageinit: docusage | 46 | usageinit: docusage |
45 | @echo 'make initbuild Create s_docbuild and if not exists, clone docbuild.git' | 47 | @echo 'make initbuild Create s_docbuild and if not exists, clone docbuild.git' |
46 | @echo 'make initcommon Create s_doceneacommon and if not exists, clone documentation.git' | 48 | @echo 'make initcommon Create s_doceneacommon and if not exists, clone el_releases-common.git' |
47 | @echo ' Default clone in tmpcommon' | 49 | @echo ' Default clone in tmpcommon' |
48 | @echo ' BOOK_GLOBALCLONEROOT=yes Clone in $(GLOBALTMPCLONEROOT)' | 50 | @echo ' BOOK_GLOBALCLONEROOT=yes Clone in $(GLOBALTMPCLONEROOT)' |
49 | @echo ' BOOK_GLOBALCLONEROOT=parentdir Clone in parentdir/tmpcommon' | 51 | @echo ' BOOK_GLOBALCLONEROOT=parentdir Clone in parentdir/tmpcommon' |
50 | @echo ' Default branch for documentation.git is master-enea' | 52 | @echo ' Default branch for el_releases-common.git is master' |
51 | @echo ' BRANCH_DOCENEACOMMON=... If another branch, Makefile should set this' | 53 | @echo ' BRANCH_DOCENEACOMMON=... If another branch, Makefile should set this' |
52 | @echo 'make pullbuild git pull in s_docbuild' | 54 | @echo 'make pullbuild git pull in s_docbuild' |
53 | @echo 'make pullcommon git pull in s_doceneacommon' | 55 | @echo 'make pullcommon git pull in s_doceneacommon' |