diff options
| author | Lennart Johansson <lennart.johansson@enea.com> | 2016-06-07 10:51:08 +0200 |
|---|---|---|
| committer | Lennart Johansson <lennart.johansson@enea.com> | 2016-06-07 10:51:08 +0200 |
| commit | a474533ecf59068600c128aba004ac477e17193d (patch) | |
| tree | d10a8deea27c79651e6bfc2d1595242f8b119ff0 /doc | |
| parent | 05fe4d406551792f6012adaa9b1924ab59beffb5 (diff) | |
| download | el_manifests-standard-a474533ecf59068600c128aba004ac477e17193d.tar.gz | |
Doc Workaround bug pkgdiff. Also move pdfs to top
With BOOK_DIST_DIR, ensure pdfs are on top
like in earlier Enea Linux.
Disable pgkdiff line in
book-enea-linux-release-info\doc\main_changes.xml
because pkgdiff not yet implemented.
Signed-off-by: Lennart Johansson <lennart.johansson@enea.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 7 | ||||
| -rw-r--r-- | doc/book-enea-linux-release-info/doc/main_changes.xml | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/Makefile b/doc/Makefile index 8d2806c..764a478 100644 --- a/doc/Makefile +++ b/doc/Makefile | |||
| @@ -152,11 +152,10 @@ dist: doc | |||
| 152 | $(VERB)if [ ! -d "`dirname $(BOOK_DIST_DIR)`" ]; then echo "ERROR: Missing parent for BOOK_DIST_DIR"; exit 10; fi | 152 | $(VERB)if [ ! -d "`dirname $(BOOK_DIST_DIR)`" ]; then echo "ERROR: Missing parent for BOOK_DIST_DIR"; exit 10; fi |
| 153 | $(VERB)if [ -f "$(BOOK_DIST_DIR)/Makefile" ]; then echo "ERROR: Wrong BOOK_DIST_DIR, contains a Makefile?"; exit 10; fi | 153 | $(VERB)if [ -f "$(BOOK_DIST_DIR)/Makefile" ]; then echo "ERROR: Wrong BOOK_DIST_DIR, contains a Makefile?"; exit 10; fi |
| 154 | $(VERB)if [ ! -d "$(BOOK_DIST_DIR)" ]; then mkdir -p "$(BOOK_DIST_DIR)" ; fi | 154 | $(VERB)if [ ! -d "$(BOOK_DIST_DIR)" ]; then mkdir -p "$(BOOK_DIST_DIR)" ; fi |
| 155 | $(VERB)if [ ! -d "$(BOOK_DIST_DIR)/pdf" ]; then mkdir -p "$(BOOK_DIST_DIR)/pdf" ; fi | ||
| 156 | $(VERB)for book in $(COMPONENTS); do \ | 155 | $(VERB)for book in $(COMPONENTS); do \ |
| 157 | if ls -d $$book/book*.pdf >/dev/null 2>&1; then cp --preserve=timestamps $$book/book*.pdf "$(BOOK_DIST_DIR)/pdf" ; fi ; \ | 156 | if ls -d $$book/book*.pdf >/dev/null 2>&1; then cp --preserve=timestamps $$book/book*.pdf "$(BOOK_DIST_DIR)" ; fi ; \ |
| 158 | if ls -d $$book/html >/dev/null 2>&1; then cp -r --preserve=timestamps $$book/html "$(BOOK_DIST_DIR)" ; fi ; \ | 157 | if ls -d $$book/html >/dev/null 2>&1; then cp -r --preserve=timestamps $$book/html "$(BOOK_DIST_DIR)" ; fi ; \ |
| 159 | if ls -d $$book/eclipse >/dev/null 2>&1; then cp -r --preserve=timestamps $$book/eclipse "$(BOOK_DIST_DIR)" ; fi ; \ | 158 | if ls -d $$book/eclipse >/dev/null 2>&1; then cp -r --preserve=timestamps $$book/eclipse "$(BOOK_DIST_DIR)" ; fi ; \ |
| 160 | done | 159 | done |
| 161 | 160 | ||
| 162 | # Default FORMATs | 161 | # Default FORMATs |
diff --git a/doc/book-enea-linux-release-info/doc/main_changes.xml b/doc/book-enea-linux-release-info/doc/main_changes.xml index 98be78c..8647a83 100644 --- a/doc/book-enea-linux-release-info/doc/main_changes.xml +++ b/doc/book-enea-linux-release-info/doc/main_changes.xml | |||
| @@ -47,6 +47,6 @@ | |||
| 47 | <para>TBD <remark>FIXME or set condition hidden</remark></para> | 47 | <para>TBD <remark>FIXME or set condition hidden</remark></para> |
| 48 | </section> | 48 | </section> |
| 49 | 49 | ||
| 50 | <xi:include href="pkgdiff_generated.xml" | 50 | <!-- <xi:include href="pkgdiff_generated.xml" |
| 51 | xmlns:xi="http://www.w3.org/2001/XInclude" /> | 51 | xmlns:xi="http://www.w3.org/2001/XInclude" /> --> |
| 52 | </chapter> \ No newline at end of file | 52 | </chapter> \ No newline at end of file |