Change relative paths.

diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index 66f9460..6f6bd54 100644 (file)
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -1,4 +1,4 @@
-\include "../stafftab.ly"
+\include "../../stafftab.ly"
 
 stickIntroLeft = \relative c, {
   r8 b-1\8\f cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |

diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index 4815944..adfcfb8 100644 (file)
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -1,4 +1,4 @@
-\include "../stafftab.ly"
+\include "../../stafftab.ly"
 \include "../music/guitar.ly"
 
 stickBreak = \unfoldRepeats \guitar

diff --git a/03-circus/music/stick.ly b/03-circus/music/stick.ly
index 0fef7cf..077c787 100644 (file)
--- a/03-circus/music/stick.ly
+++ b/03-circus/music/stick.ly
@@ -1,4 +1,4 @@
-\include "../stafftab.ly"
+\include "../../stafftab.ly"
 
 stickA = \relative c'' {
   g8 gis-. g-. gis-. | a-. gis16 g8.-. gis8-. |

diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly
index 8445aec..56b6d73 100644 (file)
--- a/04-white-noise/music/stick.ly
+++ b/04-white-noise/music/stick.ly
@@ -1,4 +1,4 @@
-\include "../stafftab.ly"
+\include "../../stafftab.ly"
 
 stickIntro = {
   \time 4/4 { R1*8 }

diff --git a/rules.mk b/rules.mk
index 9420e6a..1a85976 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -4,13 +4,13 @@ $(NAME)/$(NAME).wav: $(NAME)/$(NAME).midi
        fluidsynth -r 48000 -F $@ -l -R no -i -n -a alsa $(SOUNDFONT) $<
 
 $(NAME)/parts/%.pdf: $(NAME)/parts/%.ly $(NAME)/music/%.ly
-       $(LILY_CMD) $<
+       $(LILY_CMD) --output=$(dir $@) $<
 
 $(NAME)/$(NAME).pdf: $(NAME)/$(NAME).ly $(wildcard $(NAME)/music/*.ly)
-       $(LILY_CMD) $<
+       $(LILY_CMD) --output=$(dir $@) $<
 
 $(NAME)/$(NAME).midi: $(NAME)/$(NAME).ly $(wildcard $(NAME)/music/*.ly)
-       $(LILY_CMD) $<
+       $(LILY_CMD) --output=$(dir $@) $<
 
 $(NAME)/$(NAME)-klick-mono.wav: $(NAME)/$(NAME).tempo
        klick -W $@ -f $<