X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Frunghc%2Fghc.mk;h=26c3b312280a9b9504ec0f34fbca16ec12fc10ad;hb=b2524b3960999fffdb3767900f58825903f6560f;hp=b43634eaab2951e3240019c10ae8ace334604168;hpb=20633c5b582a2cd2b4cf8e2788e8bf7b536ba4e5;p=ghc-hetmet.git

diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk
index b43634e..26c3b31 100644
--- a/utils/runghc/ghc.mk
+++ b/utils/runghc/ghc.mk
@@ -10,16 +10,16 @@
 #
 # -----------------------------------------------------------------------------
 
-utils/runghc_dist_MODULES = Main
-utils/runghc_dist_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\""
+utils/runghc_PACKAGE = runghc
+utils/runghc_dist_USES_CABAL = YES
 utils/runghc_dist_PROG    = runghc$(exeext)
 utils/runghc_dist_SHELL_WRAPPER = YES
 utils/runghc_dist_INSTALL_SHELL_WRAPPER = YES
+utils/runghc_dist_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/build/Main.hs : utils/runghc/runghc.hs | $$(dir $$@)/.
 	"$(CP)" $< $@
 endif
 
@@ -33,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