[project @ 2001-07-16 06:33:22 by qrczak]

Fix paths in installed hsc2hs driver.

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index 80018cb..da6bcf6 100644 (file)
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.18 2001/07/11 13:10:31 rrt Exp $
+# $Id: Makefile,v 1.19 2001/07/16 06:33:22 qrczak Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -25,13 +25,16 @@ endif
 
 ifeq "$(INSTALLING)" "1"
 ifeq "$(BIN_DIST)"   "1"
+HSC2HS_BINDIR=$$\"\"libexecdir
 HSC2HS_DIR=$$\"\"libdir
 HSC2HS_EXTRA=
 else
+HSC2HS_BINDIR=$(libexecdir)
 HSC2HS_DIR=$(libdir)
 HSC2HS_EXTRA=--cc=$(bindir)/ghc-$(ProjectVersion)
 endif # BIN_DIST
 else
+HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
 HSC2HS_DIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HSC2HS_EXTRA="--cc=$(CC) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
@@ -44,7 +47,7 @@ endif
 $(SCRIPT_PROG) : Makefile
 $(INSTALLED_SCRIPT_PROG) : $(TOP)/mk/config.mk
 
-SCRIPT_SUBST_VARS = HSC2HS_DIR HS_PROG HSC2HS_EXTRA
+SCRIPT_SUBST_VARS = HSC2HS_BINDIR HSC2HS_DIR HS_PROG HSC2HS_EXTRA
 
 SCRIPT_OBJS=hsc2hs.sh
 INTERP=$(SHELL)

diff --git a/ghc/utils/hsc2hs/hsc2hs.sh b/ghc/utils/hsc2hs/hsc2hs.sh
index 3dff025..e94e58d 100644 (file)
--- a/ghc/utils/hsc2hs/hsc2hs.sh
+++ b/ghc/utils/hsc2hs/hsc2hs.sh
@@ -6,4 +6,4 @@ for arg do
     esac
 done
 
-$HSC2HS_DIR/$HS_PROG -t $HSC2HS_DIR/template-hsc.h $HSC2HS_EXTRA "$@" 
+$HSC2HS_BINDIR/$HS_PROG -t $HSC2HS_DIR/template-hsc.h $HSC2HS_EXTRA "$@"