Add DOC_TARGETS makefile variable

The variable can be set to pdf, html, man or chunks
and also any combination of the above.

27 files changed, 182 insertions, 147 deletions

diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index 8b90fa751c..3e2eb80b50 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -156,7 +156,7 @@ _create_dirs := $(shell mkdir -p $(XML_FIGURE_DIR))
 $(XML_FIGURE_DIR)/%.png: ../../emulator/internal_doc/figures/%.png
 	$(INSTALL_DATA) $< $@
 
-docs: figures
+html: figures
 
 $(INFO_FILE): $(INFO_FILE_SRC) $(ERL_TOP)/make/$(TARGET)/otp.mk
 	sed -e 's;%RELEASE%;$(SYSTEM_VSN);' $(INFO_FILE_SRC) > $(INFO_FILE)
@@ -188,7 +188,7 @@ specs.xml: specs.xml.src
 # Release Target
 # ----------------------------------------------------
 
-release_docs_spec: release_figures
+release_html_spec: release_figures
 
 release_figures:
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html/figures"
diff --git a/lib/asn1/doc/users_guide/Makefile b/lib/asn1/doc/users_guide/Makefile
index 38196f5e1c..079af7ac1f 100644
--- a/lib/asn1/doc/users_guide/Makefile
+++ b/lib/asn1/doc/users_guide/Makefile
@@ -40,8 +40,7 @@ PSFIG_FILES=
 USERS_GUIDE  = users_guide.sgml
 
 EXTRA_GEN_FILES= $(SGML_FILES:.sgml=.html) \
-	users_guide_frame.html users_guide_first.html \
-	  min_head.gif
+	users_guide_frame.html users_guide_first.html
 
 HTML_FILES= $(USERS_GUIDE:.sgml=.html)
 
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index bac562f815..3553b68510 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -50,11 +50,11 @@ include $(ERL_TOP)/make/doc.mk
 $(XMLDIR)/seehere.ent: Makefile seealso.ent
 	$(gen_verbose) sed -f seehere.sed seealso.ent > $@
 $(XMLDIR)/%.ent: %.ent
-	cp $< $@
+	$(gen_verbose) cp $< $@
 
 ldocs: local_docs $(INDEX_TARGET)
 
-depend.mk: depend.sed Makefile $(XMLDIR)/seehere.ent $(XML_REF_FILES) $(XML_CHAPTER_FILES)
+depend.mk: depend.sed Makefile $(XMLDIR)/seehere.ent $(XMLDIR)/seealso.ent $(XML_REF_FILES) $(XML_CHAPTER_FILES)
 	$(gen_verbose) \
 	(for f in $(XML_REF_FILES) $(XML_CHAPTER_FILES); do \
 	     sed -f $< $$f | sed "s@%FILE%@`basename $$f .xml`@g"; \
diff --git a/lib/erl_docgen/priv/css/Makefile b/lib/erl_docgen/priv/css/Makefile
index e3d2ee7e3f..da2ef5ad15 100644
--- a/lib/erl_docgen/priv/css/Makefile
+++ b/lib/erl_docgen/priv/css/Makefile
@@ -53,7 +53,9 @@ CSS_FILES = \
 # ----------------------------------------------------
 debug opt: 
 
-docs:
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 clean:
 	$(RM) $(TARGET_FILES)
@@ -64,16 +66,17 @@ clean:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/css"
 	$(INSTALL_DATA) $(CSS_FILES) "$(RELSYSDIR)/priv/css"
 
 
-release_docs_spec:
+release_html_spec: html
 	$(INSTALL_DIR) "$(RELEASE_PATH)/doc"
 	$(INSTALL_DATA) $(CSS_FILES) ../nyi.html "$(RELEASE_PATH)/doc"
 
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
+
 release_tests_spec:
 
 
diff --git a/lib/erl_docgen/priv/images/Makefile b/lib/erl_docgen/priv/images/Makefile
index cd98399b6a..b0263524fb 100644
--- a/lib/erl_docgen/priv/images/Makefile
+++ b/lib/erl_docgen/priv/images/Makefile
@@ -54,7 +54,9 @@ PNG_FILES = \
 # ----------------------------------------------------
 debug opt: 
 
-docs:
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 clean:
 	$(RM) $(TARGET_FILES)
@@ -70,11 +72,12 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/images"
 	$(INSTALL_DATA) $(GIF_FILES) $(PNG_FILES) "$(RELSYSDIR)/priv/images"
 
-
-release_docs_spec:
+release_html_spec:
 	$(INSTALL_DIR) "$(RELEASE_PATH)/doc"
 	$(INSTALL_DATA) $(PNG_FILES) "$(RELEASE_PATH)/doc"
 
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
+
 release_tests_spec:
 
 
diff --git a/lib/erl_docgen/priv/js/flipmenu/Makefile b/lib/erl_docgen/priv/js/flipmenu/Makefile
index ad6d4acb6c..be0bed74fb 100644
--- a/lib/erl_docgen/priv/js/flipmenu/Makefile
+++ b/lib/erl_docgen/priv/js/flipmenu/Makefile
@@ -56,7 +56,9 @@ JS_FILES = \
 # ----------------------------------------------------
 debug opt: 
 
-docs:
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 clean:
 	$(RM) $(TARGET_FILES)
@@ -67,17 +69,17 @@ clean:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/js/flipmenu"
 	$(INSTALL_DATA) $(JS_FILES) $(GIF_FILES) "$(RELSYSDIR)/priv/js/flipmenu"
 
-
-release_docs_spec:
+release_html_spec: html
 	$(INSTALL_DIR) "$(RELEASE_PATH)/doc/js/flipmenu"
 	$(INSTALL_DATA) $(JS_FILES) $(GIF_FILES) "$(RELEASE_PATH)/doc/js/flipmenu"
 	$(INSTALL_DATA) ../highlight.js ../highlight.pack.js "$(RELEASE_PATH)/doc/js/"
 
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
+
 release_tests_spec:
 
 
diff --git a/lib/kernel/doc/src/part.xml b/lib/kernel/doc/src/part.xml
index 91acdc014a..a5e29ce6eb 100644
--- a/lib/kernel/doc/src/part.xml
+++ b/lib/kernel/doc/src/part.xml
@@ -34,5 +34,4 @@
   <xi:include href="introduction_chapter.xml"/>
   <xi:include href="logger_chapter.xml"/>
   <xi:include href="logger_cookbook.xml"/>
-  <xi:include href="documentation_chapter.xml"/>
 </part>
diff --git a/lib/mnesia/doc/misc/Makefile b/lib/mnesia/doc/misc/Makefile
index 29e2682967..0622a0b809 100644
--- a/lib/mnesia/doc/misc/Makefile
+++ b/lib/mnesia/doc/misc/Makefile
@@ -39,7 +39,7 @@ TEX_FILES= $(SGML_FILES:.sgml=.tex)
 DVI_FILES= $(SGML_FILES:.sgml=.dvi)
 PSFIG_FILES= $(FIG_FILES:.fig=.ps) 
 PS_FILES= $(SGML_FILES:.sgml=.ps)
-GIF_FILES= min_head.gif
+GIF_FILES=
 ERL_FILES=
 HRL_FILES=
 DATA_FILES=
diff --git a/lib/reltool/doc/src/files.mk b/lib/reltool/doc/src/files.mk
index efd7d8f09c..46288d0f50 100644
--- a/lib/reltool/doc/src/files.mk
+++ b/lib/reltool/doc/src/files.mk
@@ -37,3 +37,6 @@ BOOK_FILES = book.xml
 
 IMAGE_FILES =
 
+XML_FILES = \
+	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
+	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile
index b7775d1c8c..c19ad3668c 100644
--- a/lib/tools/emacs/Makefile
+++ b/lib/tools/emacs/Makefile
@@ -65,7 +65,9 @@ clean:
 	rm -f $(TARGET_FILES) $(ELC_FILES)
 	rm -f errs core *~
 
-docs:
+DOC_TARGETS?=man
+
+docs: $(DOC_TARGETS)
 
 # ----------------------------------------------------
 # Release Target
@@ -77,14 +79,8 @@ release_spec: opt
 	$(INSTALL_DATA) $(EL_FILES) $(README_FILES) \
 		"$(RELSYSDIR)/emacs"
 
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec:
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec:
-else
-release_docs_spec: docs
+release_man_spec:
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN_FILES) "$(RELEASE_PATH)/man/man3"
-endif
-endif
+
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
diff --git a/make/doc.mk b/make/doc.mk
index d45e07e795..cbba59b60d 100644
--- a/make/doc.mk
+++ b/make/doc.mk
@@ -75,6 +75,8 @@ EMPTY_CHUNK_FILES = $(filter-out $(NO_CHUNKS:%.xml=$(CHUNKSDIR)/%.chunk) $(CHUNK
 
 SPECS_FLAGS = -I$(ERL_TOP)/lib -I$(ERL_TOP)/lib/*/include -I$(ERL_TOP)/lib/*/src
 
+
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -85,13 +87,15 @@ $(HTMLDIR)/%.png: %.png
 $(HTMLDIR)/%.jpg: %.jpg
 	$(INSTALL_DATA) $< $@
 
-docs: man pdf html chunks $(INFO_FILE)
+DOC_TARGETS?=man pdf html chunks
+
+docs: $(INFO_FILE) $(DOC_TARGETS)
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
-html: images $(HTML_REF_MAN_FILE)
+html: images $(HTML_REF_MAN_FILE) $(HTMLDIR)/$(APPLICATION).eix
 
 man: $(MAN1_FILES) $(MAN2_FILES) $(MAN3_FILES) $(MAN4_FILES) $(MAN5_FILES) $(MAN6_FILES) $(MAN7_FILES)
 
@@ -146,19 +150,27 @@ clean_chunks:
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
+$(RELSYSDIR):
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+
+release_pdf_spec: pdf
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+
+release_html_spec: html
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DIR_DATA) $(HTMLDIR) "$(RELSYSDIR)/doc/html"
 ifneq ($(HTML_EXTRA_FILES),)
 	$(INSTALL_DATA) $(HTML_EXTRA_FILES) "$(RELSYSDIR)/doc/html"
 endif
+
+release_chunks_spec: chunks
 ifneq ($(CHUNK_FILES),)
 	$(INSTALL_DIR) "$(RELCHUNKSDIR)/doc/chunks"
 	$(INSTALL_DATA) $(CHUNKSDIR)/* "$(RELCHUNKSDIR)/doc/chunks"
 endif
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+
+release_man_spec: man
 ifneq ($(MAN1_FILES),)
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
 	$(INSTALL_DATA) $(MAN1DIR)/* "$(RELEASE_PATH)/man/man1"
@@ -187,6 +199,9 @@ ifneq ($(MAN7_FILES),)
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man7"
 	$(INSTALL_DATA) $(MAN7_FILES) "$(RELEASE_PATH)/man/man7"
 endif
+
+release_docs_spec: $(RELSYSDIR) $(INFO_FILE) $(DOC_TARGETS:%=release_%_spec)
+	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 ifneq ($(STANDARDS),)
 	$(INSTALL_DIR) "$(RELEASE_PATH)/doc/standard"
 	$(INSTALL_DATA) $(STANDARDS) "$(RELEASE_PATH)/doc/standard"
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 64061ac7b5..5c1032c894 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -271,7 +271,7 @@ DEFAULT_HTML_FILES = \
 	$(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.kwc) \
 	$(HTMLDIR)/index.html
 
-DEFAULT_GIF_FILES = $(HTMLDIR)/min_head.gif
+DEFAULT_GIF_FILES =
 
 #
 # Flags & Commands
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index eeca2dd5da..fe1f5103ca 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -142,8 +142,6 @@ $(HTMLDIR)/$(APPLICATION).eix: $(XML_GEN_FILES) $(SPECS_FILES)
 	        -path $(DOCGEN)/priv/dtd_html_entities \
 	        $(DOCGEN)/priv/xsl/db_eix.xsl $(XMLDIR)/book.xml >  $@
 
-docs: $(HTMLDIR)/$(APPLICATION).eix
-
 ## Here awk is used to find all xi:include files in $(BOOK_FILES)
 ## Then we look into all those files check for xi:includes
 BOOK_XI_INC_FILES:=$(foreach file,$(BOOK_FILES),$(shell awk -F\" '/xi:include/ {print $$2}' $(file))) $(BOOK_FILES)
@@ -207,15 +205,21 @@ endif
 # Standard release target
 # ----------------------------------------------------
 
+pdf man chunks html: $(XML_GEN_FILES) $(SPECS_FILES) $(TOP_SPECS_FILE)
+release_man_spec: man
+release_pdf_spec: pdf
+release_chunks_spec: chunks
+release_html_spec: html
+
 ifeq ($(TESTROOT),)
 
-release release_docs release_tests release_html:
+release release_docs release_tests:
 	$(MAKE) $(MFLAGS) RELEASE_PATH=$(OTP_DEFAULT_RELEASE_PATH) \
 		$(TARGET_MAKEFILE)  $@_spec
 
 else
 
-release release_docs release_tests release_html:
+release release_docs release_tests:
 	$(MAKE) $(MFLAGS) RELEASE_PATH="$(TESTROOT)" $(TARGET_MAKEFILE)  $@_spec 
 
 endif
diff --git a/system/doc/design_principles/Makefile b/system/doc/design_principles/Makefile
index 2fbd7d087f..d781809137 100644
--- a/system/doc/design_principles/Makefile
+++ b/system/doc/design_principles/Makefile
@@ -95,7 +95,9 @@ $(HTMLDIR)/%.gif: %.gif
 $(HTMLDIR)/%.svg: %.svg
 	$(INSTALL_DATA) $< $@
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -116,12 +118,11 @@ clean clean_docs:
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(IMAGE_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(IMAGE_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
 release_spec:
diff --git a/system/doc/efficiency_guide/Makefile b/system/doc/efficiency_guide/Makefile
index a2742a1354..285f8aad4b 100644
--- a/system/doc/efficiency_guide/Makefile
+++ b/system/doc/efficiency_guide/Makefile
@@ -88,7 +88,9 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -107,15 +109,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
 release_spec:
-
-
-
diff --git a/system/doc/embedded/Makefile b/system/doc/embedded/Makefile
index 1604075312..bb95c8370f 100644
--- a/system/doc/embedded/Makefile
+++ b/system/doc/embedded/Makefile
@@ -76,7 +76,9 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -95,13 +97,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
-release_spec:
-
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
+release_spec:
diff --git a/system/doc/general_info/Makefile b/system/doc/general_info/Makefile
index 539075280e..7496e128b2 100644
--- a/system/doc/general_info/Makefile
+++ b/system/doc/general_info/Makefile
@@ -69,7 +69,9 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -88,12 +90,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
-release_spec:
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
+release_spec:
diff --git a/system/doc/getting_started/Makefile b/system/doc/getting_started/Makefile
index 1c917895d5..47442e85e3 100644
--- a/system/doc/getting_started/Makefile
+++ b/system/doc/getting_started/Makefile
@@ -75,7 +75,9 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -94,11 +96,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
+
 release_spec:
diff --git a/system/doc/installation_guide/Makefile b/system/doc/installation_guide/Makefile
index c5234c1c9a..c95a426653 100644
--- a/system/doc/installation_guide/Makefile
+++ b/system/doc/installation_guide/Makefile
@@ -100,7 +100,9 @@ $(REDIRECT_HTML_DIR)/%.html: Makefile
 	echo "This <a href=\"../"$(notdir $@)"\">link</a> will" >> $@
 	echo "take you there immediately.</p></body></html>" >> $@
 
-docs: $(XML_GEN_FILES) html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 local_docs: $(XML_GEN_FILES)
@@ -123,13 +125,12 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html $(RELSYSDIR)
 	$(INSTALL_DIR) $(REDIRECT_HTML_RELSYSDIR)
 	$(INSTALL_DATA) $(REDIRECT_HTML_FILES) $(REDIRECT_HTML_RELSYSDIR)
 
-release_spec:
-
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
+release_spec:
diff --git a/system/doc/oam/Makefile b/system/doc/oam/Makefile
index 2eb429e04d..4e3848a91a 100644
--- a/system/doc/oam/Makefile
+++ b/system/doc/oam/Makefile
@@ -75,7 +75,9 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(CP) $< $@
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -96,11 +98,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
-release_spec:
-
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
+release_spec:
diff --git a/system/doc/programming_examples/Makefile b/system/doc/programming_examples/Makefile
index 9c67c24b64..7c1bdde698 100644
--- a/system/doc/programming_examples/Makefile
+++ b/system/doc/programming_examples/Makefile
@@ -75,7 +75,10 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
+
 local_docs: PDFDIR=../../pdf
 
 html: $(GIF_FILES) $(HTML_UG_FILE)
@@ -93,12 +96,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
-release_spec:
-
-
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
+release_spec:
diff --git a/system/doc/reference_manual/Makefile b/system/doc/reference_manual/Makefile
index 809eb2c979..f7b93814ab 100644
--- a/system/doc/reference_manual/Makefile
+++ b/system/doc/reference_manual/Makefile
@@ -18,6 +18,7 @@
 # %CopyrightEnd%
 #
 #
+
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
@@ -25,10 +26,10 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # Application version
 # ----------------------------------------------------
 include $(ERL_TOP)/erts/vsn.mk
-#VSN=$(SYSTEM_VSN)
 
 APPLICATION=otp-system-documentation
 XMLDIR := $(XMLDIR)/reference_manual
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -40,6 +41,7 @@ RELSYSDIR = "$(RELEASE_PATH)/doc/reference_manual"
 XML_PART_FILES = part.xml
 
 include xmlfiles.mk
+
 XML_CHAPTER_FILES=$(REF_MAN_CHAPTER_FILES)
 
 TOPDOCDIR=..
@@ -48,7 +50,6 @@ BOOK_FILES = book.xml
 
 GIF_FILES= 
 
-
 XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) 
@@ -65,14 +66,6 @@ HTML_FILES = \
 
 HTMLDIR = ../html/reference_manual
 
-EXTRA_FILES = $(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(C_FILES) \
-	$(ERL_FILES) \
-	$(HRL_FILES) \
-	$(MISC_FILES) \
-	$(XML_CHAPTER_FILES:%.xml=%.html)
-
 HTML_UG_FILE = $(HTMLDIR)/users_guide.html
 
 # ----------------------------------------------------
@@ -85,7 +78,9 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -104,14 +99,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
-release_spec:
-
-
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
+release_spec:
diff --git a/system/doc/system_architecture_intro/Makefile b/system/doc/system_architecture_intro/Makefile
index ea9ee85105..a7b00b4ec5 100644
--- a/system/doc/system_architecture_intro/Makefile
+++ b/system/doc/system_architecture_intro/Makefile
@@ -70,7 +70,9 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -89,13 +91,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
-release_spec:
-
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
+release_spec:
diff --git a/system/doc/system_principles/Makefile b/system/doc/system_principles/Makefile
index 5110b73373..44009b674f 100644
--- a/system/doc/system_principles/Makefile
+++ b/system/doc/system_principles/Makefile
@@ -71,7 +71,9 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -90,12 +92,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
-release_spec:
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
 
+release_spec:
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index e3f9c4710a..2953491d71 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -249,8 +249,9 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
+DOC_TARGETS?=pdf html man
 
-docs: pdf html $(INFO_FILES)
+docs: $(DOC_TARGETS) $(INFO_FILES)
 
 local_docs: PDFREFDIR=../pdf
 
@@ -258,10 +259,11 @@ $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
-html:   $(INDEX_FILES) \
-	$(MAN_INDEX) $(JAVASCRIPT)
+html: $(INDEX_FILES) $(JAVASCRIPT)
 
-debug opt: 
+man: $(MAN_INDEX)
+
+debug opt:
 
 clean:
 	$(RM) ../html/js/*.js
@@ -280,21 +282,28 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 $(RELSYSDIR)/temporary:
 	$(INSTALL_DIR) $(RELSYSDIR)/temporary
 
-release_docs_spec: docs
-	$(INSTALL_DIR)  "$(RELEASE_PATH)"
-	$(INSTALL_DATA) $(INFO_FILES) "$(RELEASE_PATH)"
-	$(INSTALL_DIR)  $(RELSYSDIR)
-	$(INSTALL_DIR)  $(RELSYSDIR)/pdf
-	$(INSTALL_DATA)  \
-		$(TOP_PDF_FILE) $(RELSYSDIR)/pdf
+$(RELSYSDIR)/docbuild:
+	$(INSTALL_DIR)  $(RELSYSDIR)/docbuild
+
+release_man_spec: man $(RELSYSDIR)/docbuild
+	$(INSTALL_DATA) $(MAN_INDEX) $(RELSYSDIR)
+	$(INSTALL_DATA) $(MAN_INDEX_SRC) $(MAN_INDEX_SCRIPT) $(RELSYSDIR)/docbuild
+
+release_html_spec: html $(RELSYSDIR)/docbuild
 	$(INSTALL_DIR)  $(RELSYSDIR)/js
 	$(INSTALL_DATA) $(JAVASCRIPT) $(RELSYSDIR)/js
-	$(INSTALL_DATA) $(INDEX_FILES) $(MAN_INDEX) $(RELSYSDIR)
-	$(INSTALL_DIR)  $(RELSYSDIR)/docbuild
-	$(INSTALL_DATA) $(INDEX_SCRIPT) $(MAN_INDEX_SCRIPT) $(JAVASCRIPT_BUILD_SCRIPT) \
-		$(INDEX_SRC) $(MAN_INDEX_SRC) $(JAVASCRIPT_BUILD_SCRIPT_SRC) \
+	$(INSTALL_DATA) $(INDEX_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(INDEX_SCRIPT) $(JAVASCRIPT_BUILD_SCRIPT) \
+		$(INDEX_SRC) $(JAVASCRIPT_BUILD_SCRIPT_SRC) \
 		$(TEMPLATES) $(RELSYSDIR)/docbuild
-	$(RM) -r $(RELSYSDIR)/temporary
 
+release_pdf_spec: pdf
+	$(INSTALL_DIR)  $(RELSYSDIR)/pdf
+	$(INSTALL_DATA)  \
+		$(TOP_PDF_FILE) $(RELSYSDIR)/pdf
+
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec) $(INFO_FILES)
+	$(INSTALL_DATA) $(INFO_FILES) "$(RELEASE_PATH)"
+	$(RM) -r $(RELSYSDIR)/temporary
 
 release_spec:
diff --git a/system/doc/top/print.html b/system/doc/top/print.html
index b562d0e9bc..e65ac491a9 100644
--- a/system/doc/top/print.html
+++ b/system/doc/top/print.html
@@ -19,7 +19,7 @@
 
 <center>
 <a href="http://www.ericsson.com/technology/opensource/erlang">
-  <img  alt="Ericsson AB" BORDER=0 SRC="pics/min_head.gif">
+  <img  alt="Ericsson AB" BORDER=0>
 </a>
 <br>
 
diff --git a/system/doc/tutorial/Makefile b/system/doc/tutorial/Makefile
index 4c62deeffd..effc673af6 100644
--- a/system/doc/tutorial/Makefile
+++ b/system/doc/tutorial/Makefile
@@ -97,7 +97,9 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(CP) $< $@
 
-docs: html
+DOC_TARGETS?=html
+
+docs: $(DOC_TARGETS)
 
 local_docs: PDFDIR=../../pdf
 
@@ -118,11 +120,11 @@ clean clean_docs:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_docs_spec: docs
-#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
-#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
-	$(INSTALL_DIR) $(RELSYSDIR)
+release_html_spec: html
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
 		$(RELSYSDIR)
 
+release_docs_spec: $(DOC_TARGETS:%=release_%_spec)
+
 release_spec: