From 5b5d9bcd765bc9827c66338d1c257f2d851cd5ab Mon Sep 17 00:00:00 2001 From: roktas Date: Sat, 17 Nov 2007 21:01:34 +0000 Subject: Use $(GHC) instead of ghc and make them user configurable through environment to support unusual ghc installations, for example: GHC=/opt/ghc/bin/ghc GHC_PKG=/opt/ghc/bin/ghc-pkg make git-svn-id: https://pandoc.googlecode.com/svn/trunk@1081 788f1e2b-df1e-0410-8736-df70ead52e1b --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 30a3141c0..dd3a47339 100644 --- a/Makefile +++ b/Makefile @@ -66,8 +66,8 @@ INSTALL := install -c INSTALL_PROGRAM := $(INSTALL) -m 755 INSTALL_DATA := $(INSTALL) -m 644 STRIP := strip -GHC := ghc -GHC_PKG := ghc-pkg +GHC ?= ghc +GHC_PKG ?= ghc-pkg #------------------------------------------------------------------------------- # Recipes @@ -120,7 +120,7 @@ $(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh cleanup_files+=Setup.hi Setup.o $(BUILDCMD) $(BUILDVARS) configure: $(BUILDCONF) templates $(BUILDCONF): $(CABAL) - ghc -package Cabal Setup.hs -o $(BUILDCMD) + $(GHC) -package Cabal Setup.hs -o $(BUILDCMD) $(BUILDCMD) configure --prefix=$(PREFIX) # Make configuration time settings persistent (definitely a hack). @echo "PREFIX?=$(PREFIX)" >$(BUILDVARS) -- cgit v1.2.3