Enable building Cabal with parsec
[ghc.git] / rules / shell-wrapper.mk
index f5d91e3..eb7d8f1 100644 (file)
@@ -26,7 +26,7 @@ ifeq "$$($1_$2_WANT_INPLACE_WRAPPER)" "YES"
 $1_$2_INPLACE_SHELL_WRAPPER_NAME = $$($1_$2_PROG)
 
 ifeq "$$($1_$2_TOPDIR)" "YES"
-$1_$2_INPLACE_WRAPPER = $$(INPLACE_LIB)/$$($1_$2_INPLACE_SHELL_WRAPPER_NAME)
+$1_$2_INPLACE_WRAPPER = $$(INPLACE_LIB)/bin/$$($1_$2_INPLACE_SHELL_WRAPPER_NAME)
 else
 $1_$2_INPLACE_WRAPPER = $$(INPLACE_BIN)/$$($1_$2_INPLACE_SHELL_WRAPPER_NAME)
 endif
@@ -46,7 +46,7 @@ $$($1_$2_INPLACE_WRAPPER): $$($1_$2_INPLACE)
        echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"'                             >> $$@
        echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"'                              >> $$@
        echo 'topdir="$$(TOP)/$$(INPLACE_TOPDIR)"'                           >> $$@
-       echo 'pgmgcc="$$(WhatGccIsCalled)"'                                  >> $$@
+       echo 'pgmgcc="$$(CC)"'                                               >> $$@
        $$($1_$2_SHELL_WRAPPER_EXTRA)
        $$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA)
 ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES"
@@ -77,7 +77,7 @@ install: install_$1_$2_wrapper
 .PHONY: install_$1_$2_wrapper
 install_$1_$2_wrapper: WRAPPER=$$(DESTDIR)$$(bindir)/$(CrossCompilePrefix)$$($1_$2_INSTALL_SHELL_WRAPPER_NAME)
 install_$1_$2_wrapper:
-       $$(call INSTALL_DIR,"$$(DESTDIR)$$(bindir)")
+       $$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)"
        $$(call removeFiles,                                        "$$(WRAPPER)")
        $$(CREATE_SCRIPT)                                           "$$(WRAPPER)"
        echo '#!$$(SHELL)'                                       >> "$$(WRAPPER)"