Repository : ssh://darcs.haskell.org//srv/darcs/haddock On branch : master
http://hackage.haskell.org/trac/ghc/changeset/27c3e36448ab7092e0f52be1ce245c7f58a6ebca >--------------------------------------------------------------- commit 27c3e36448ab7092e0f52be1ce245c7f58a6ebca Author: Ian Lynagh <[email protected]> Date: Sat Nov 19 01:33:21 2011 +0000 Follow GHC build system change to the way we call rm >--------------------------------------------------------------- ghc.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ghc.mk b/ghc.mk index 12335fb..3742565 100644 --- a/ghc.mk +++ b/ghc.mk @@ -12,11 +12,11 @@ ifneq "$(BINDIST)" "YES" $(INPLACE_BIN)/$(utils/haddock_dist_PROG): $(INPLACE_LIB)/html $(INPLACE_LIB)/latex $(INPLACE_LIB)/html: - "$(RM)" $(RM_OPTS_REC) $@ + $(call removeTrees,$@) "$(CP)" -R utils/haddock/html $@ $(INPLACE_LIB)/latex: - "$(RM)" $(RM_OPTS_REC) $@ + $(call removeTrees,$@) "$(CP)" -R utils/haddock/latex $@ endif @@ -45,7 +45,7 @@ install_utils/haddock_data: .PHONY: install_utils/haddock_link install_utils/haddock_link: - "$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/haddock" + $(call removeFiles,"$(DESTDIR)$(bindir)/haddock") $(LN_S) $(utils/haddock_dist_INSTALL_SHELL_WRAPPER_NAME) "$(DESTDIR)$(bindir)/haddock" BINDIST_EXTRAS += $(addprefix utils/haddock/,$(utils/haddock_dist_DATA_FILES)) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
