git.iko.soy/typeable/pandoc
on master help sign in
Makefile: build reference.odt before configure.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1354 788f1e2b-df1e-0410-8736-df70ead52e1b

commitc45833a392642c9abd5732ca17e0baa212e6c7ad authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateFri 1 Aug 2008, 01:26 (18 years ago) parentbf6db92
1 file changed+3−3
Makefile+3−3
Makefile+3−3
@@ -112,12 +112,12 @@ cleanup_files+=$(ODTREF)
112112$(ODTREF): $(addprefix $(ODTSTYLES)/, layout-cache meta.xml styles.xml content.xml mimetype \
113113 settings.xml Configurations2 Thumbnails META-INF)
114114 cd $(ODTSTYLES) ; \
115− zip -9 -r $(notdir $@) * -x $(notdir $@)
115+ zip -9 -q -r $(notdir $@) * -x $(notdir $@)
116116
117117.PHONY: wrappers
118118wrappers: $(WRAPPERS)
119119cleanup_files+=$(WRAPPERS)
120−$(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh $(ODTREFSH)
120+$(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh
121121 @$(generate-shell-script)
122122
123123CABAL_BACKUP=$(CABAL).orig
@@ -138,7 +138,7 @@ templates=$(wildcard templates/*.* templates/headers/*.* templates/ui/default/*.
138138configure: $(BUILDCONF)
139139$(BUILDCMD): Setup.hs
140140 $(GHC) -package Cabal Setup.hs -o $(BUILDCMD)
141−$(BUILDCONF): $(CABAL) $(CABAL_BACKUP) $(BUILDCMD) $(templates)
141+$(BUILDCONF): $(CABAL) $(CABAL_BACKUP) $(BUILDCMD) $(templates) $(ODTREF)
142142 $(BUILDCMD) configure --prefix=$(PREFIX) --with-compiler=$(GHC) $(hc_pkg) $(CABALOPTS)
143143 @# Make configuration time settings persistent (definitely a hack).
144144 @echo "PREFIX?=$(PREFIX)" >$(BUILDVARS)