Fix segfault in array copy primops on 32-bit

[ghc-hetmet.git] / utils / runghc / ghc.mk

diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk
index 7d6769d..7c6a34a 100644 (file)
--- a/utils/runghc/ghc.mk
+++ b/utils/runghc/ghc.mk
@@ -10,23 +10,21 @@
 #
 # -----------------------------------------------------------------------------
 
-utils/runghc_dist_MODULES = Main
-utils/runghc_dist_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\""
-utils/runghc_dist_PROG    = runghc$(exeext)
-utils/runghc_dist_SHELL_WRAPPER = YES
-utils/runghc_dist_INSTALL_SHELL_WRAPPER = YES
+utils/runghc_PACKAGE = runghc
+utils/runghc_dist-install_USES_CABAL = YES
+utils/runghc_dist-install_PROG    = runghc$(exeext)
+utils/runghc_dist-install_SHELL_WRAPPER = YES
+utils/runghc_dist-install_INSTALL_SHELL_WRAPPER = YES
+utils/runghc_dist-install_EXTRA_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\""
 
 ifneq "$(BINDIST)" "YES"
-
 # hack: the build system has trouble with Main modules not called Main.hs
-utils/runghc/dist/build/Main.hs : utils/runghc/runghc.hs $(MKDIRHIER)
-       "$(MKDIRHIER)" $(dir $@)
+utils/runghc/dist-install/build/Main.hs : utils/runghc/runghc.hs | $$(dir $$@)/.
        "$(CP)" $< $@
-
-$(eval $(call build-prog,utils/runghc,dist,1))
-
 endif
 
+$(eval $(call build-prog,utils/runghc,dist-install,1))
+
 install: install_runhaskell
 
 .PHONY: install_runhaskell
@@ -35,7 +33,7 @@ install_runhaskell: install_bins
        "$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext) $(DESTDIR)$(bindir)/runhaskell$(exeext)
 else
 install_runhaskell:
-       "$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/runhaskell
-       $(LN_S) runghc $(DESTDIR)$(bindir)/runhaskell
+       "$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/runhaskell"
+       $(LN_S) runghc "$(DESTDIR)$(bindir)/runhaskell"
 endif