diff -urN cgicc-ref/doc/Makefile.am cgicc-dev/doc/Makefile.am
--- cgicc-ref/doc/Makefile.am	2014-03-28 21:35:38.000000000 +0100
+++ cgicc-dev/doc/Makefile.am	2016-03-22 22:49:31.592657831 +0100
@@ -8,7 +8,7 @@
 cgi-overview.tmpl tutorial.tmpl lib-overview.tmpl COPYING COPYING.LIB	\
 COPYING.DOC header.html footer.html cgicc-doc.css
 
-IMAGES = cgicc.png gnu-head-sm.jpg
+IMAGES = $(srcdir)/cgicc.png $(srcdir)/gnu-head-sm.jpg
 
 EXTRA_DIST = html stamp index.tmpl license.tmpl lists.tmpl bugs.tmpl demos.tmpl		\
 cgi-overview.tmpl tutorial.tmpl lib-overview.tmpl COPYING COPYING.LIB	\
@@ -24,7 +24,7 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)@htmldir@
-	for file in $(srcdir)/html/*; do \
+	for file in $(builddir)/html/*; do \
 		bn="`basename $$file`"; \
 	 	$(INSTALL_DATA) $$file $(DESTDIR)@htmldir@/$$bn; \
 	done
@@ -42,14 +42,14 @@
 
 ## Generate documentation
 html-doc:
-	if test ! -d html; then \
-		mkdir html; \
+	if test ! -d $(builddir)/html; then \
+		mkdir $(builddir)/html; \
 	fi;
 	DATE=`date '+%-d %b %Y'` VERSION=$(VERSION) $(DOXYGEN) Doxyfile
-	cp $(IMAGES) cgicc-doc.css html
-	if test ! -d html/index.html; then \
-		echo empty> html/index.html; \
+	cp $(IMAGES) $(srcdir)/cgicc-doc.css $(builddir)/html
+	if test ! -d $(builddir)/html/index.html; then \
+		echo empty> $(builddir)/html/index.html; \
 	fi;
-	mv html/index.html html/index.html.bak
-	sed -e '$(SEDCMD1)' -e '$(SEDCMD2)' html/index.html.bak > html/index.html
-	rm -f html/index.html.bak
+	mv $(builddir)/html/index.html $(builddir)/html/index.html.bak
+	sed -e '$(SEDCMD1)' -e '$(SEDCMD2)' $(builddir)/html/index.html.bak > $(builddir)/html/index.html
+	rm -f $(builddir)/html/index.html.bak
diff -urN cgicc-ref/doc/Makefile.in cgicc-dev/doc/Makefile.in
--- cgicc-ref/doc/Makefile.in	2014-12-07 15:17:16.000000000 +0100
+++ cgicc-dev/doc/Makefile.in	2016-03-23 00:20:37.288830401 +0100
@@ -240,7 +240,7 @@
 cgi-overview.tmpl tutorial.tmpl lib-overview.tmpl COPYING COPYING.LIB	\
 COPYING.DOC header.html footer.html cgicc-doc.css
 
-IMAGES = cgicc.png gnu-head-sm.jpg
+IMAGES = $(srcdir)/cgicc.png $(srcdir)/gnu-head-sm.jpg
 EXTRA_DIST = html stamp index.tmpl license.tmpl lists.tmpl bugs.tmpl demos.tmpl		\
 cgi-overview.tmpl tutorial.tmpl lib-overview.tmpl COPYING COPYING.LIB	\
 COPYING.DOC header.html footer.html cgicc-doc.css cgicc.png gnu-head-sm.jpg
@@ -449,7 +449,7 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)@htmldir@
-	for file in $(srcdir)/html/*; do \
+	for file in $(builddir)/html/*; do \
 		bn="`basename $$file`"; \
 	 	$(INSTALL_DATA) $$file $(DESTDIR)@htmldir@/$$bn; \
 	done
@@ -465,17 +465,17 @@
 	touch $@
 
 html-doc:
-	if test ! -d html; then \
-		mkdir html; \
+	if test ! -d $(builddir)/html; then \
+		mkdir $(builddir)/html; \
 	fi;
 	DATE=`date '+%-d %b %Y'` VERSION=$(VERSION) $(DOXYGEN) Doxyfile
-	cp $(IMAGES) cgicc-doc.css html
-	if test ! -d html/index.html; then \
-		echo empty> html/index.html; \
+	cp $(IMAGES) $(srcdir)/cgicc-doc.css $(builddir)/html
+	if test ! -d $(builddir)/html/index.html; then \
+		echo empty> $(builddir)/html/index.html; \
 	fi;
-	mv html/index.html html/index.html.bak
-	sed -e '$(SEDCMD1)' -e '$(SEDCMD2)' html/index.html.bak > html/index.html
-	rm -f html/index.html.bak
+	mv $(builddir)/html/index.html $(builddir)/html/index.html.bak
+	sed -e '$(SEDCMD1)' -e '$(SEDCMD2)' $(builddir)/html/index.html.bak > $(builddir)/html/index.html
+	rm -f $(builddir)/html/index.html.bak
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.