diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-11-05 15:57:27 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-11-05 15:57:27 +0000 |
| commit | 8fd5ae0f3d101d7671b18fff5652f02e6e540b39 (patch) | |
| tree | d0050dd6cd96fbd867eaedee2449a8cfc318401f | |
| parent | 7b5ba19752328af61d189b1f03cfbe30288cf74f (diff) | |
GHC build system: Make *nix installation work in paths containing spaces
| -rw-r--r-- | ghc.mk | 8 | ||||
| -rw-r--r-- | haddock.wrapper | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -24,15 +24,15 @@ utils/haddock_dist_MODULES += Paths_haddock install: install_utils/haddock_html .PHONY: install_utils/haddock_html install_utils/haddock_html: - $(INSTALL_DIR) $(DESTDIR)$(docdir)/html - "$(CP)" -R utils/haddock/html $(DESTDIR)$(docdir)/html + $(INSTALL_DIR) "$(DESTDIR)$(docdir)/html" + "$(CP)" -R utils/haddock/html "$(DESTDIR)$(docdir)/html" install: install_utils/haddock_data .PHONY: install_utils/haddock_data install_utils/haddock_data: - $(INSTALL_DIR) $(DESTDIR)$(ghclibdir)/html + $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/html" for i in utils/haddock/html/*; do \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir)/html; \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)/html"; \ done BINDIST_EXTRAS += $(addprefix utils/haddock/,html/*) diff --git a/haddock.wrapper b/haddock.wrapper index 0895fbac..a0fbda30 100644 --- a/haddock.wrapper +++ b/haddock.wrapper @@ -1,3 +1,3 @@ #!/bin/sh -exec $executablename -B$topdir -l$topdir ${1+"$@"} +exec "$executablename" -B"$topdir" -l"$topdir" ${1+"$@"} |