Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1043)

Unified Diff: make/lilypond-book-rules.make

Issue 357760043: Issue 5381: Change intermediate PDF filename
Patch Set: Use different dir for LaTeX etc. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | stepmake/stepmake/texinfo-rules.make » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: make/lilypond-book-rules.make
diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index 243a9f18c789f25167589ca2fc72a9667932d5eb..8ce484a1eb3fed90eb9b68afaf7cd6342225da14 100644
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -26,13 +26,25 @@ $(outdir)/%.tex: %.latex
# Add the tex => pdf rule only if we have pdflatex
ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
$(outdir)/%.pdf: $(outdir)/%.tex
- cd $(outdir) && $(buildscript-dir)/run-and-check "$(PDFLATEX) -halt-on-error $(notdir $<)" "$*.pdflatex.log"
+ rm -fr $(outdir)/$*.build/
+ mkdir $(outdir)/$*.build
+ cd $(outdir) && $(buildscript-dir)/run-and-check \
+ "$(PDFLATEX) -halt-on-error \
+ -output-directory=$*.build \
+ $(notdir $<)" \
+ "$*.pdflatex.log"
ifeq ($(USE_EXTRACTPDFMARK),yes)
- $(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@
- $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@
- rm $@
- mv $(outdir)/$*.final.pdf $@
+ $(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $(outdir)/$*.build/$*.pdf
+ $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None \
+ -sOutputFile=$@ \
+ -c "30000000 setvmthreshold" \
+ -f $(top-build-dir)/out-fonts/*.font.ps \
+ $(outdir)/$*.pdfmark \
+ $(outdir)/$*.build/$*.pdf
+else
+ mv $(outdir)/$*.build/$*.pdf $@
endif
+ rm -fr $(outdir)/$*.build/
endif
############## Texinfo ######################
@@ -58,11 +70,19 @@ $(outdir)/%.xml: %.lyxml
# Add the xml => pdf rule only if we have dblatex
ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
$(outdir)/%.pdf: $(outdir)/%.xml
- cd $(outdir) && $(buildscript-dir)/run-and-check "$(DBLATEX) $(DBLATEX_BACKEND) $(notdir $<)" "$*.dblatex.log"
+ cd $(outdir) && $(buildscript-dir)/run-and-check \
+ "$(DBLATEX) $(DBLATEX_BACKEND) -o $*.tmp.pdf $(notdir $<)" \
+ "$*.dblatex.log"
ifeq ($(USE_EXTRACTPDFMARK),yes)
- $(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@
- $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@
- rm $@
- mv $(outdir)/$*.final.pdf $@
+ $(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $(outdir)/$*.tmp.pdf
+ $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None \
+ -sOutputFile=$@ \
+ -c "30000000 setvmthreshold" \
+ -f $(top-build-dir)/out-fonts/*.font.ps \
+ $(outdir)/$*.pdfmark \
+ $(outdir)/$*.tmp.pdf
+ rm $(outdir)/$*.tmp.pdf
+else
+ mv $(outdir)/$*.tmp.pdf $@
endif
endif
« no previous file with comments | « no previous file | stepmake/stepmake/texinfo-rules.make » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b