X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=c824dad2851c1adfebb75f13b4d9be0bccafe304;hb=c0be61743a875b59a1ffe6f0af6a50d4f9d091ef;hp=625d58152d2f04977adefe9d211ec4ff72605932;hpb=950c7dc13e9e5be6b3cb8ead25c2650de21c2ef8;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 625d581..c824dad 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)" ""
 
 #
@@ -795,13 +806,6 @@ install:: $(INSTALL_INCLUDES)
 endif
 
 ifneq "$(INSTALL_DOCS)" ""
-ifneq "$(SGMLDocWays)" ""
-install-docs:: $(INSTALL_DOCS)
-	@$(INSTALL_DIR) $(datadir)	
-	for i in $(INSTALL_DOCS); do \
-		$(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \
-	done
-endif
 ifneq "$(XMLDocWays)" ""
 install-docs:: $(INSTALL_DOCS)
 	@$(INSTALL_DIR) $(datadir)	
@@ -833,23 +837,6 @@ install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-
 endif
 endif
 
-ifneq "$(INSTALL_SGML_DOC)" ""
-ifneq "$(SGMLDocWays)" ""
-install-docs:: $(foreach i,$(SGMLDocWays),$(INSTALL_SGML_DOC).$i)
-	@$(INSTALL_DIR) $(datadir)	
-	@for i in $(SGMLDocWays); do \
-		if [ $$i = "html" ]; then \
-			$(INSTALL_DIR) $(datadir)/html; \
-			echo $(CP) -r $(INSTALL_SGML_DOC) $(datadir)/html; \
-			$(CP) -r $(INSTALL_SGML_DOC) $(datadir)/html; \
-		else \
-			echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \
-			$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \
-		fi \
-	done
-endif
-endif
-
 #
 # Use with care..
 #
@@ -933,52 +920,6 @@ show:
 
 ################################################################################
 #
-#			SGML Documentation
-#
-################################################################################
-
-.PHONY: dvi ps html pdf rtf
-
-ifneq "$(SGML_DOC)" ""
-
-all :: $(SGMLDocWays)
-
-# multi-file SGML document: main document name is specified in $(SGML_DOC),
-# sub-documents (.sgml files) listed in $(SGML_SRCS).
-
-ifeq "$(SGML_SRCS)" ""
-SGML_SRCS = $(wildcard *.sgml)
-endif
-
-SGML_TEX  = $(addsuffix .tex,$(SGML_DOC))
-SGML_DVI  = $(addsuffix .dvi,$(SGML_DOC))
-SGML_PS   = $(addsuffix .ps,$(SGML_DOC))
-SGML_PDF  = $(addsuffix .pdf,$(SGML_DOC))
-SGML_RTF  = $(addsuffix .rtf,$(SGML_DOC))
-SGML_HTML = $(addsuffix .html,$(SGML_DOC))
-# HTML output goes in a subdirectory on its own.
-SGML_TEXT = $(addsuffix .txt,$(SGML_DOC))
-
-$(SGML_DVI) $(SGML_PS) $(SGML_HTML) $(SGML_TEXT) $(SGML_PDF) :: $(SGML_SRCS)
-
-dvi  :: $(SGML_DVI)
-ps   :: $(SGML_PS)
-pdf  :: $(SGML_PDF)
-rtf  :: $(SGML_RTF)
-html :: $(SGML_HTML)
-txt  :: $(SGML_TEXT)
-
-CLEAN_FILES += $(SGML_TEXT) $(SGML_TEX) $(SGML_PS) $(SGML_DVI) $(SGML_PDF) $(SGML_RTF) $(SGML_HTML) $(SGML_DOC)-*.html
-# can't use $(SGML_SRCS) here, it was maybe used elsewhere
-
-extraclean ::
-	$(RM) -rf DBTOHTML_OUTPUT_*
-	$(RM) -rf *.junk/
-	$(RM) -rf $(SGML_DOC)
-endif
-
-################################################################################
-#
 #			DocBook XML Documentation
 #
 ################################################################################