diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2008-08-10 00:13:51 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2008-08-10 00:13:51 +0000 |
| commit | 9d54611d874a9555a64bfeabd8e7c1da6611ebb2 (patch) | |
| tree | 8f4094a61874dc62c0a70b221e9e49a3c305c60e | |
| parent | ee7a458796e727f9136059a1e274f3337f9371bf (diff) | |
| download | pandoc-9d54611d874a9555a64bfeabd8e7c1da6611ebb2.tar.gz | |
Removed dependency on reference.odt from Makefile.
This is handled now in Setup.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1392 788f1e2b-df1e-0410-8736-df70ead52e1b
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -34,7 +34,6 @@ PROGS := $(EXECS) $(WRAPPERS) MAIN := $(firstword $(EXECS)) DOCS := README.html README BUGS MANPAGES := $(patsubst %.md,%,$(wildcard $(MANDIR)/man?/*.?.md)) -ODTREF := $(ODTSTYLES)/reference.odt #------------------------------------------------------------------------------- # Variables to setup through environment @@ -102,7 +101,7 @@ templates=$(wildcard templates/*.* templates/headers/*.* templates/ui/default/*. configure: $(BUILDCONF) $(BUILDCMD): Setup.hs $(GHC) -package Cabal Setup.hs -o $(BUILDCMD) -$(BUILDCONF): $(CABAL) $(CABAL_BACKUP) $(BUILDCMD) $(templates) $(ODTREF) +$(BUILDCONF): $(CABAL) $(CABAL_BACKUP) $(BUILDCMD) $(templates) $(BUILDCMD) configure --prefix=$(PREFIX) --with-compiler=$(GHC) $(hc_pkg) $(CABALOPTS) @# Make configuration time settings persistent (definitely a hack). @echo "PREFIX?=$(PREFIX)" >$(BUILDVARS) |