From 40177a742658281235312f8322af71c2a3e6dab1 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sun, 1 Nov 2009 13:30:29 +0100
Subject: [PATCH] Use relative includes

---
 oly_settings_choralscore.ily | 3 ++-
 oly_settings_fullscore.ily   | 3 ++-
 oly_settings_global.ily      | 5 +++--
 oly_settings_instrument.ily  | 3 ++-
 oly_settings_vocalscore.ily  | 3 ++-
 oly_settings_vocalvoice.ily  | 5 +++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/oly_settings_choralscore.ily b/oly_settings_choralscore.ily
index 3c63c0c..5ff3ef7 100644
--- a/oly_settings_choralscore.ily
+++ b/oly_settings_choralscore.ily
@@ -1,5 +1,6 @@
 % lilypond input for Choral scores: A4, 5mm staff height
-\include "orchestrallily/oly_settings_fullscore.ily"
+#(ly:set-option 'relative-includes #t)
+\include "oly_settings_fullscore.ily"
 
 % Don't print short instruments name, they are clear from the beginning
 OShortInstrumentName = #f
diff --git a/oly_settings_fullscore.ily b/oly_settings_fullscore.ily
index c38dd0d..92f3311 100644
--- a/oly_settings_fullscore.ily
+++ b/oly_settings_fullscore.ily
@@ -1,6 +1,7 @@
 % lilypond input for full scores
 % changes to the global score settings for full scores
-\include "orchestrallily/oly_settings_global.ily"
+#(ly:set-option 'relative-includes #t)
+\include "oly_settings_global.ily"
 
 % #(set-default-paper-size "a4")
 #(set-global-staff-size 14.5)
diff --git a/oly_settings_global.ily b/oly_settings_global.ily
index c185c18..7d6a2d2 100644
--- a/oly_settings_global.ily
+++ b/oly_settings_global.ily
@@ -1,7 +1,8 @@
 \version "2.11.35"
 
-\include "orchestrallily/orchestrallily.ily"
-\include "orchestrallily/oly_settings_names.ily"
+#(ly:set-option 'relative-includes #t)
+\include "orchestrallily.ily"
+\include "oly_settings_names.ily"
 
 
 % Some spacing settings, need to test them before I can enable them
diff --git a/oly_settings_instrument.ily b/oly_settings_instrument.ily
index b501ac4..d100e79 100644
--- a/oly_settings_instrument.ily
+++ b/oly_settings_instrument.ily
@@ -1,6 +1,7 @@
 % lilypond settings for instrumental scores
 % changes to the global score settings for single-instrument sheets
-\include "orchestrallily/oly_settings_global.ily"
+#(ly:set-option 'relative-includes #t)
+\include "oly_settings_global.ily"
 
 
 \paper {
diff --git a/oly_settings_vocalscore.ily b/oly_settings_vocalscore.ily
index 43ba65f..7ed652e 100644
--- a/oly_settings_vocalscore.ily
+++ b/oly_settings_vocalscore.ily
@@ -1,6 +1,7 @@
 % lilypond input for vocal scores
 % changes to the full score settings for vocal scores
-\include "orchestrallily/oly_settings_choralscore.ily"
+#(ly:set-option 'relative-includes #t)
+\include "oly_settings_choralscore.ily"
 
 % Use 27x19 cm paper, 1.5cm margins.
 \paper {
diff --git a/oly_settings_vocalvoice.ily b/oly_settings_vocalvoice.ily
index e3d2e9f..61f0c4a 100644
--- a/oly_settings_vocalvoice.ily
+++ b/oly_settings_vocalvoice.ily
@@ -1,5 +1,6 @@
-% lilypond settings for vocal scores 
-\include "orchestrallily/oly_settings_global.ily"
+% lilypond settings for vocal scores
+#(ly:set-option 'relative-includes #t)
+\include "oly_settings_global.ily"
 
 \paper {
   ragged-bottom = ##f
-- 
2.11.4.GIT