From 722c9c994b0d7ebf5464a63fd22bdfe98b57f01d Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 12 Oct 2009 20:23:59 +0200
Subject: [PATCH] Makefile fixes

---
 Templates/EK_Full/Makefile     | 4 ++--
 Templates/Single_Page/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Templates/EK_Full/Makefile b/Templates/EK_Full/Makefile
index de9111b..985c5bf 100644
--- a/Templates/EK_Full/Makefile
+++ b/Templates/EK_Full/Makefile
@@ -2,11 +2,11 @@ OUT=out
 
 <$ for w in works -$>
 base<< w.nr >> = << w.basename >>
-SRCS<< w.nr >> = << w.srcfiles.settings|join (" ") >> << w.srcfiles.parts|join (" ") >> $(base)_Settings.ily
+SRCS<< w.nr >> = << [w.srcfiles.parts|join (" "), w.srcfiles.settings|join (" ")]|join(" ")|replace ( w.basename, "$(base" ~ w.nr ~ ")" ) >>
 instruments<< w.nr >> = << w.instruments|join (" ") >>
 scores<< w.nr >> = << w.scores|join (" ") >>
 pdfs<< w.nr >> = $(instruments<<w.nr>>:%=$(OUT)/$(base<<w.nr>>)_Instrument_%.pdf) \
-     $(scores<<w.nr>>:%%=$(OUT)/$(base<<w.nr>>)_Score_%.pdf)
+     $(scores<<w.nr>>:%=$(OUT)/$(base<<w.nr>>)_Score_%.pdf)
 
 <$ endfor $>
 <$ if latex -$>
diff --git a/Templates/Single_Page/Makefile b/Templates/Single_Page/Makefile
index ef3892d..390c39c 100644
--- a/Templates/Single_Page/Makefile
+++ b/Templates/Single_Page/Makefile
@@ -48,7 +48,7 @@ SRCS<< w.nr >> = << w.srcfiles.settings|join (" ") >> << w.srcfiles.parts|join (
 instruments<< w.nr >> = << w.instruments|join (" ") >>
 scores<< w.nr >> = << w.scores|join (" ") >>
 pdfs<< w.nr >> = $(instruments<<w.nr>>:%=$(OUT)/$(base<<w.nr>>)_Instrument_%.pdf) \
-     $(scores<<w.nr>>:%%=$(OUT)/$(base<<w.nr>>)_Score_%.pdf)
+     $(scores<<w.nr>>:%=$(OUT)/$(base<<w.nr>>)_Score_%.pdf)
 
 <$ endfor $>
 <$ if latex -$>
-- 
2.11.4.GIT