From c45833a392642c9abd5732ca17e0baa212e6c7ad Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Fri, 1 Aug 2008 01:26:58 +0000 Subject: Makefile: build reference.odt before configure. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1354 788f1e2b-df1e-0410-8736-df70ead52e1b --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bc11f6a79..e3b474f2c 100644 --- a/Makefile +++ b/Makefile @@ -112,12 +112,12 @@ cleanup_files+=$(ODTREF) $(ODTREF): $(addprefix $(ODTSTYLES)/, layout-cache meta.xml styles.xml content.xml mimetype \ settings.xml Configurations2 Thumbnails META-INF) cd $(ODTSTYLES) ; \ - zip -9 -r $(notdir $@) * -x $(notdir $@) + zip -9 -q -r $(notdir $@) * -x $(notdir $@) .PHONY: wrappers wrappers: $(WRAPPERS) cleanup_files+=$(WRAPPERS) -$(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh $(ODTREFSH) +$(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh @$(generate-shell-script) CABAL_BACKUP=$(CABAL).orig @@ -138,7 +138,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) +$(BUILDCONF): $(CABAL) $(CABAL_BACKUP) $(BUILDCMD) $(templates) $(ODTREF) $(BUILDCMD) configure --prefix=$(PREFIX) --with-compiler=$(GHC) $(hc_pkg) $(CABALOPTS) @# Make configuration time settings persistent (definitely a hack). @echo "PREFIX?=$(PREFIX)" >$(BUILDVARS) -- cgit v1.2.3