resolve merge

[lilypond.git] / make / ly-rules.make

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 52ee4b015ed731b0a46d47e3fa3f62dfc6d604d4..0df0643ee3158ec5ad2c0a685d752942ea30d18e 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -2,7 +2,7 @@
 
 # TODO: fix hardcoded out/ ?
 LYS_OUTPUT_OPTION= --lily-output-dir $(LYS_OUTPUT_DIR)
-LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-db/
+LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-db
 LILYPOND_BOOK_FLAGS += $(LYS_OUTPUT_OPTION)
 $(outdir)/%.latex: %.doc $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
        LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) $<
@@ -15,7 +15,9 @@ $(i)
 $(i): 
 endef
 
-$(eval $(firstword $(MASTER_TEXI_FILES)): $(foreach i, $(wordlist 2, $(words $(MASTER_TEXI_FILES)), $(MASTER_TEXI_FILES)),$(CHAIN_RULE)))
+$(eval $(firstword $(TEXI_FILES_FROM_TELY)):\
+ $(foreach i, $(wordlist 2, $(words $(TEXI_FILES_FROM_TELY)),\
+ $(TEXI_FILES_FROM_TELY)),$(CHAIN_RULE)))
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
@@ -33,14 +35,8 @@ $(outdir)/%.html.omf: %.tely
 $(outdir)/%.pdf.omf: %.tely
        $(call GENERATE_OMF,pdf)
 
-$(outdir)/%.ps.gz.omf: %.tely
-       $(call GENERATE_OMF,ps.gz)
-
 $(outdir)/%.html.omf: $(outdir)/%.texi
        $(call GENERATE_OMF,html)
 
 $(outdir)/%.pdf.omf: $(outdir)/%.texi
        $(call GENERATE_OMF,pdf)
-
-$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
-       $(call GENERATE_OMF,ps.gz)