Doc Move pdfs to top, not in subdir pdf/

With BOOK_DIST_DIR, ensure pdfs are on top
like in earlier Enea Linux.

Signed-off-by: Lennart Johansson <lennart.johansson@enea.com>

1 files changed, 3 insertions, 4 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
         $(VERB)if [ ! -d "`dirname $(BOOK_DIST_DIR)`" ]; then echo "ERROR: Missing parent for BOOK_DIST_DIR"; exit 10; fi
         $(VERB)if [ -f "$(BOOK_DIST_DIR)/Makefile" ]; then echo "ERROR: Wrong BOOK_DIST_DIR, contains a Makefile?"; exit 10; fi
         $(VERB)if [ ! -d "$(BOOK_DIST_DIR)" ]; then mkdir -p "$(BOOK_DIST_DIR)" ; fi
-        $(VERB)if [ ! -d "$(BOOK_DIST_DIR)/pdf" ]; then mkdir -p "$(BOOK_DIST_DIR)/pdf" ; fi
         $(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)/pdf" ; 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 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 ; \
         done
 
 # Default FORMATs