documentation: Makefile corrections to support web server structure

The web server directory structure for the post 1.0 releases was changed.
Also, the creation of a new 1.0 area in the web structure was retroactively
created.  this broke the five make files for publishing documents to the web.

I fixed all five files so they now push to the 1.0 area only.  The fix included
hard-coding the 1.0 directory structure.  I also set them up to be a little more
generic.

(From yocto-docs rev: d2cd8f1165b0cc995fc322a7d836de0902da7614)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 29 insertions, 7 deletions

diff --git a/documentation/adt-manual/Makefile b/documentation/adt-manual/Makefile
index 560913a69d..f23de5c561 100644
--- a/documentation/adt-manual/Makefile
+++ b/documentation/adt-manual/Makefile
@@ -1,9 +1,33 @@
+# You must call this Makefile using the following form:
+#
+#     make
+#     make html
+#     make pdf
+#     make tarball
+#     make clean
+#     make publish
+#
+# "make" creates the HTML, PDF, and tarballs.
+# "make html" creates just the HTML
+# "make pdf" creates just the PDF
+# "make tarball" creates the tarball
+# "make clean" removes the HTML and PDF files
+# "make publish" pushes the HTML, PDF, figures, and stylesheet to the web server
+#
+
 XSLTOPTS = --stringparam html.stylesheet style.css \
            --stringparam  chapter.autolabel 1 \
            --stringparam  appendix.autolabel A \
            --stringparam  section.autolabel 1 \
            --stringparam  section.label.includes.component.label 1 \
-         --xinclude
+           --xinclude
+VER = 1.0
+DOC = adt-manual
+ALLPREQ = html pdf tarball
+TARFILES = adt-manual.html adt-manual.pdf style.css figures/adt-title.png
+MANUALS = $(DOC).html $(DOC).pdf
+FIGURES = figures
+STYLESHEET = *.css
 
 ##
 # These URI should be rewritten by your distribution's xml catalog to
@@ -27,16 +51,14 @@ html:
         xsltproc $(XSLTOPTS) -o adt-manual.html adt-manual-customization.xsl adt-manual.xml
 
 tarball: html
-        tar -cvzf adt-manual.tgz adt-manual.html adt-manual.pdf style.css figures/adt-title.png figures/yocto-project-transp.png
+        cd $(DOC); tar -cvzf $(DOC).tgz $(TARFILES); cd ..
 
 validate:
         xmllint --postvalid --xinclude --noout adt-manual.xml
 
-OUTPUTS = adt-manual.tgz adt-manual.html adt-manual.pdf
-SOURCES = *.png *.xml *.css
-
 publish:
-        scp -r $(OUTPUTS) $(SOURCES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-doc/adt-manual
+        scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/$(VER)/$(DOC)
+        scp -r $(FIGURES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/$(VER)/$(DOC)/figures
 
 clean:
-        rm -f $(OUTPUTS)
+        rm -f $(MANUALS)