From 3f1c10745b2c2621f07ddf917e1f3fa331f2f400 Mon Sep 17 00:00:00 2001 From: Lennart Johansson Date: Thu, 9 Jun 2016 14:42:16 +0200 Subject: Doc Makefile BOOK_DIST_DIR will not include eclipsehelp format Makefile now requires BOOK_DIST_ECLIPSE=yes to include also the eclipsehelp book formats in the copy to BOOK_DIST_DIR. Default is now to only include pdf and html (like in EL5) Still all three are built by default. Signed-off-by: Lennart Johansson --- doc/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index 764a478..19c8a1f 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -75,6 +75,8 @@ docusage: @echo 'make doc #Builds the userdoc, does autoinit if needed' @echo 'make dist BOOK_DIST_DIR=xx/doc #Builds all and copies results to BOOK_DIST_DIR' @echo ' #Does not work with DOCBOOK_TO_BOOKDIR or BOOK_BUILD_DIR' + @echo ' #Currently EclipseHelp formated doc will not be in BOOK_DIST_DIR' + @echo ' # unless BOOK_DIST_ECLIPSE is set to yes' @echo 'make init #Init all needed init* below' @echo 'make initbuild #Init s_docbuild Docbook build system and central files' @echo 'make inittargets #Init s_targets using repo tool Targets in this distro with poky' @@ -155,7 +157,9 @@ dist: doc $(VERB)for book in $(COMPONENTS); do \ if ls -d $$book/book*.pdf >/dev/null 2>&1; then cp --preserve=timestamps $$book/book*.pdf "$(BOOK_DIST_DIR)" ; fi ; \ if ls -d $$book/html >/dev/null 2>&1; then cp -r --preserve=timestamps $$book/html "$(BOOK_DIST_DIR)" ; fi ; \ - if ls -d $$book/eclipse >/dev/null 2>&1; then cp -r --preserve=timestamps $$book/eclipse "$(BOOK_DIST_DIR)" ; fi ; \ + if [ "$(BOOK_DIST_ECLIPSE)" = "yes" ]; then \ + if ls -d $$book/eclipse >/dev/null 2>&1; then cp -r --preserve=timestamps $$book/eclipse "$(BOOK_DIST_DIR)" ; fi ; \ + fi ; \ done # Default FORMATs -- cgit v1.2.3-54-g00ecf