diff --git a/Makefile b/Makefile
index b937794..e0df849 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 OUTDIR=out
 PDFDIR=pdf
 FILE = sheet-music_tinwhistle
-LILY_PDF = lilypond-book --pdf -o $(OUTDIR)
-PDF=cd $(OUTDIR) && pdflatex $(FILE).tex
-INDEX=cd $(OUTDIR) && makeindex $(FILE).tex
+LILY_PDF = /usr/bin/env lilypond-book --pdf -o $(OUTDIR)
+PDF=cd $(OUTDIR) && /usr/bin/env pdflatex $(FILE).tex
+INDEX=cd $(OUTDIR) && /usr/bin/env makeindex $(FILE).tex
 
 # The suffixes used in this Makefile.
 .SUFFIXES: .lytex .tex .ly .pdf
diff --git a/Makefile~ b/Makefile~
new file mode 100644
index 0000000..e0df849
--- /dev/null
+++ b/Makefile~
@@ -0,0 +1,37 @@
+OUTDIR=out
+PDFDIR=pdf
+FILE = sheet-music_tinwhistle
+LILY_PDF = /usr/bin/env lilypond-book --pdf -o $(OUTDIR)
+PDF=cd $(OUTDIR) && /usr/bin/env pdflatex $(FILE).tex
+INDEX=cd $(OUTDIR) && /usr/bin/env makeindex $(FILE).tex
+
+# The suffixes used in this Makefile.
+.SUFFIXES: .lytex .tex .ly .pdf
+
+# Input and output files are searched in the directories listed in
+# the VPATH variable.  All of them are subdirectories of the current
+# directory (given by the GNU make variable `CURDIR').
+VPATH = \
+	$(CURDIR)/lyrics \
+	$(CURDIR)/notes \
+	$(CURDIR)/pdf \      
+
+all: book
+
+book: $(OUTDIR) $(PDFDIR)
+	cp headfoot.tex $(OUTDIR)/
+	cp -r images/ $(OUTDIR)/
+	$(LILY_PDF) $(FILE).lytex
+	$(PDF)
+	$(INDEX)
+	$(PDF)
+	cp $(CURDIR)/$(OUTDIR)/$(FILE).pdf $(CURDIR)/$(PDFDIR)/$(FILE).pdf
+  
+$(OUTDIR):
+	mkdir -p $(OUTDIR)
+
+$(PDFDIR):
+	mkdir -p $(PDFDIR)
+
+clean:
+	rm -rf $(OUTDIR)