git.iko.soy/typeable/pandoc
on master help sign in
Small improvements in Makefile:

+ Added $(BUILDCMD) target, so setup doesn't get compiled every time. + Removed (now circular) dependency of templates on ./templates. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1107 788f1e2b-df1e-0410-8736-df70ead52e1b

commitae5697e3b4b4836023ae868196758e692a9843f8 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateThu 29 Nov 2007, 02:03 (19 years ago) parentb2fa8c7
1 file changed+4−3
compare with master
unifiedsplit
Makefile+4−3
Makefile+4−3
@@ -93,7 +93,7 @@ all: build-program
9393 ./$(MAIN) -s -S -w man $< >$@ || rm -f $@
9494
9595.PHONY: templates
96−templates: $(SRCDIR)/templates
96+templates:
9797 $(MAKE) -C $(SRCDIR)/templates
9898
9999define generate-shell-script
@@ -128,10 +128,11 @@ $(CABAL_BACKUP):
128128.PHONY: configure
129129cleanup_files+=Setup.hi Setup.o $(BUILDCMD) $(BUILDVARS)
130130configure: $(BUILDCONF) templates
131−$(BUILDCONF): $(CABAL) $(CABAL_BACKUP)
131+$(BUILDCMD): Setup.hs
132132 $(GHC) -package Cabal Setup.hs -o $(BUILDCMD)
133+$(BUILDCONF): $(CABAL) $(CABAL_BACKUP) $(BUILDCMD)
133134 $(BUILDCMD) configure --prefix=$(PREFIX) --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG)
134− # Make configuration time settings persistent (definitely a hack).
135+ @# Make configuration time settings persistent (definitely a hack).
135136 @echo "PREFIX?=$(PREFIX)" >$(BUILDVARS)
136137 @echo "DESTDIR?=$(DESTDIR)" >>$(BUILDVARS)
137138