[MXD2map-commits] bsh.mxd-konverter: r219:f13f51627f07

[scm-commit@wald.intevation.org]

details:   bsh.mxd-konverter/rev/f13f51627f07

changeset: 219:f13f51627f07

user:      Stephan Holl <stephan.holl at intevation.de>

date:      Wed Jul 27 09:16:00 2011 +0200

description:
Adopted Makefiles to build documentation as well


diffstat:

 doku/Makefile        |  4 ++++
 website/buildhtml.mk |  7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (49 lines):

diff -r fb1ffd385115 -r f13f51627f07 doku/Makefile
--- a/doku/Makefile	Mon Jul 25 11:09:52 2011 +0200
+++ b/doku/Makefile	Wed Jul 27 09:16:00 2011 +0200
@@ -7,6 +7,7 @@
 PAPER         =
 BUILDDIR      = build
 MAKE          = make
+WEBSITE       = ../website/documentation
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
@@ -132,3 +133,6 @@
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
+
+online: html
+	rm -rf $(WEBSITE) && mkdir -p $(WEBSITE) && cp -r build/html/* $(WEBSITE)
diff -r fb1ffd385115 -r f13f51627f07 website/buildhtml.mk
--- a/website/buildhtml.mk	Mon Jul 25 11:09:52 2011 +0200
+++ b/website/buildhtml.mk	Wed Jul 27 09:16:00 2011 +0200
@@ -17,7 +17,7 @@
 # Installation configuration
 INSTALL_DIR = ./mxd2map-www
 ADD_INST_TYPES = *.css *.php *.png .htaccess
-ADD_INST_DIRS = img
+ADD_INST_DIRS = img documentation
 
 CURDIR=$(shell pwd)
 
@@ -31,6 +31,9 @@
 $(TARGETS): template.m4 template_header.m4 \
             header.m4 style.css
 
+documentation:
+	$(MAKE) -C ../doku online
+
 images:
 	$(MAKE) -C ../doku/funktionsweise/ all
 
@@ -39,7 +42,7 @@
 	  $(MAKE) -C $$dir SUBDIRS="" ; \
 	done
 
-online: all
+online: all documentation
 	echo "Going to put current contents online for www.mxd2mapp.org ..."
 	rsync -urvPL --exclude='.hg' $(ADD_INST_TYPES) $(TARGETS) $(ADD_INST_DIRS) \
         sholl at wald.intevation.org:/mxd2map/htdocs/