X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=ab4a8995c7e7f12842e26754c70aec77e0e181eb;hb=13aca089b924f6ac3cd598e17b471ab38a1e3e78;hp=f4aaa1121df34e1ec7ec3f2f431f181bfef3fd7a;hpb=0ba4b0a1104131cd6eae8d570c1e1a713094543c;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index f4aaa11..ab4a899 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -681,6 +681,17 @@ install-dirs ::
 # within the various install targets instead.
 #install:: install-dirs
 
+#
+# Setting user/group ownership for the installed entities
+#
+ifneq "$(INSTALL_OWNER)" ""
+SRC_INSTALL_OPTS += -o $(INSTALL_OWNER)
+endif
+ifneq "$(INSTALL_GROUP)" ""
+SRC_INSTALL_OPTS += -g $(INSTALL_GROUP)
+endif
+
+
 ifneq "$(INSTALL_PROGS)" ""
 
 #
@@ -811,23 +822,19 @@ install-docs:: $(INSTALL_DOCS)
 endif
 endif
 
-# The following could be an entry for an Obfuscated Makefile Contest...
+# TODO: The following could be an entry for an Obfuscated Makefile Contest...
 ifneq "$(INSTALL_XML_DOC)" ""
 ifneq "$(XMLDocWays)" ""
-install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.htmlhelp,%-htmlhelp/index.html,$(patsubst %.html,%-html/index.html,.$(i)))))
+install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.htmlhelp,%.chm,$(patsubst %.html,%-html/index.html,.$(i)))))
 	@$(INSTALL_DIR) $(datadir)	
 	@for i in $(XMLDocWays); do \
 		if [ $$i = "html" ]; then \
 			$(INSTALL_DIR) $(datadir)/html; \
 			echo "( cd $(INSTALL_XML_DOC)-html && $(CP) * $(datadir)/html )" ; \
 			( cd $(INSTALL_XML_DOC)-html && $(CP) * $(datadir)/html ) ; \
-		elif [ $$i = "htmlhelp" ]; then \
-			$(INSTALL_DIR) $(datadir)/htmlhelp; \
-			echo "( cd $(INSTALL_XML_DOC)-htmlhelp && $(CP) * $(datadir)/htmlhelp )" ; \
-			( cd $(INSTALL_XML_DOC)-htmlhelp && $(CP) * $(datadir)/htmlhelp ) ; \
 		else \
-			echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.html-no-chunks/.html/` $(datadir); \
-			$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.html-no-chunks/.html/` $(datadir); \
+			echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.htmlhelp/.chm/ | sed s/\.html-no-chunks/.html/` $(datadir); \
+			$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.htmlhelp/.chm/ | sed s/\.html-no-chunks/.html/` $(datadir); \
 		fi; \
 		if [ $$i = "html-no-chunks" ]; then \
 			echo $(CP) $(FPTOOLS_CSS_ABS) $(datadir); \