From f87d23a5fda565effcbd7aef941cd28b67627165 Mon Sep 17 00:00:00 2001
From: Martin Nowak <code@dawg.eu>
Date: Thu, 23 Jul 2015 07:31:46 +0200
Subject: [PATCH] Revert "Merge pull request #3382 from andralex/tee"

This reverts commit 2ed7d909b4dfb8154584976254358c3cb8645c31, reversing
changes made to 54dece1b646efe37f9c32617b3dd23194f6dd143.
---
 posix.mak | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/posix.mak b/posix.mak
index 112a34d757d..df95661b661 100644
--- a/posix.mak
+++ b/posix.mak
@@ -423,12 +423,14 @@ endif
 ###########################################################
 # html documentation
 
+# Package to html, e.g. std/algorithm -> std_algorithm.html
+P2HTML=$(addsuffix .html,$(subst /,_,$1))
 # D file to html, e.g. std/conv.d -> std_conv.html
-# However, std/algorithm/package.d -> std_algorithm.html
-D2HTML=$(subst /,_,$(subst .d,.html,$(subst /package.d,.d,$1)))
+D2HTML=$(subst /,_,$(subst .d,.html,$1))
 
 HTMLS=$(addprefix $(DOC_OUTPUT_DIR)/, \
-	$(call D2HTML, $(SRC_DOCUMENTABLES)))
+	$(call D2HTML, $(SRC_DOCUMENTABLES)) \
+	$(call P2HTML, $(STD_PACKAGES)))
 BIGHTMLS=$(addprefix $(BIGDOC_OUTPUT_DIR)/, \
 	$(call D2HTML, $(SRC_DOCUMENTABLES)))
 
@@ -441,6 +443,12 @@ $(foreach p,$(SRC_DOCUMENTABLES),$(eval \
 $(DOC_OUTPUT_DIR)/$(call D2HTML,$p) : $p $(STDDOC) ;\
   $(DDOC) project.ddoc $(STDDOC) -Df$$@ $$<))
 
+# For each package, define a rule e.g.:
+# ../web/phobos/std_algorithm.html : std/algorithm/package.d $(STDDOC) ; ...
+$(foreach p,$(STD_PACKAGES),$(eval \
+$(DOC_OUTPUT_DIR)/$(call P2HTML,$p) : $(STDDOC) ;\
+  $(DDOC) project.ddoc $(STDDOC) -Df$$@ $$<))
+
 html : $(DOC_OUTPUT_DIR)/. $(HTMLS) $(STYLECSS_TGT)
 
 allmod :