mirror of
https://github.com/jgm/pandoc.git
synced 2026-09-24 15:44:59 +08:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user