Use a real binary instead of scripts for ghc-inplace

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

diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index 38be1f4..42a831b 100644 (file)
--- a/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -40,7 +40,7 @@ INPLACE_SCRIPT=hsc2hs-inplace.bat
 FULL_INPLACE_PATH=$(subst /,\,$(FPTOOLS_TOP_ABS_PLATFORM)/utils/hsc2hs/)
 all::
        $(RM) -f $(INPLACE_SCRIPT)
-       echo '@call $(FULL_INPLACE_PATH)$(HS_PROG)) ----template=$(FULL_INPLACE_PATH)template-hsc.h $(HSC2HS_EXTRA) %*' >> $(INPLACE_SCRIPT)
+       echo '@call $(FULL_INPLACE_PATH)$(HS_PROG) --template=$(FULL_INPLACE_PATH)template-hsc.h $(HSC2HS_INPLACE_EXTRA) %*' >> $(INPLACE_SCRIPT)
        $(EXECUTABLE_FILE) $(INPLACE_SCRIPT)
 else
 INPLACE_SCRIPT=hsc2hs-inplace
@@ -50,7 +50,7 @@ all::
        echo "HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)"       >> $(INPLACE_SCRIPT)
        echo "HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_HSC2HS_DIR_REL)" >> $(INPLACE_SCRIPT)
        echo "HS_PROG=$(HS_PROG)"                                           >> $(INPLACE_SCRIPT)
-       echo "HSC2HS_EXTRA=$(HSC2HS_INPLACE_EXTRA)"                         >> $(INPLACE_SCRIPT)
+       echo "HSC2HS_EXTRA=\"$(HSC2HS_INPLACE_EXTRA)\""                     >> $(INPLACE_SCRIPT)
        cat hsc2hs.sh                                                       >> $(INPLACE_SCRIPT)
        $(EXECUTABLE_FILE) $(INPLACE_SCRIPT)
 endif
@@ -79,4 +79,11 @@ endif
 override datadir=$(libdir)
 INSTALL_DATAS += template-hsc.h
 
+binary-dist:
+       $(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs
+       $(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/hsc2hs/
+       $(INSTALL_DATA)    hsc2hs.sh        $(BIN_DIST_DIR)/utils/hsc2hs/
+       $(INSTALL_DATA)    $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
+       $(INSTALL_PROGRAM) $(HS_PROG)       $(BIN_DIST_DIR)/utils/hsc2hs/
+
 include $(TOP)/mk/target.mk