Use update-alternatives for handling generic tool names

[ghc-hetmet.git] / utils / hsc2hs / Makefile

diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index 0216983..88f3edb 100644 (file)
--- a/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -13,7 +13,7 @@ include $(GHC_COMPAT_DIR)/compat.mk
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
 # we must also build with $(GhcHcOpts) here:
-SRC_HC_OPTS += $(GhcHcOpts)
+SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
 
 HS_PROG           = hsc2hs-bin
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
@@ -33,7 +33,7 @@ endif
 SRC_HC_OPTS      += -Wall
 
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-INSTALLED_SCRIPT_PROG  = hsc2hs
+INSTALLED_SCRIPT_PROG  = hsc2hs-ghc
 endif
 INPLACE_SCRIPT_PROG    = hsc2hs-inplace