From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 21 Aug 2002 21:20:23 +0000 (+0000)
Subject: * lily/main.cc (setup_paths): Prepend dirs to search path, instead
X-Git-Tag: release/1.6.1~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=38d65860ae30e1b3722655b974f365df60e8cc59;p=lilypond.git

* lily/main.cc (setup_paths): Prepend dirs to search path, instead
of appending.  Fixes build when typical LilyPond 1.4 leftovers clutter
the system.

* flower/include/file-path.hh (prepend): New function.
---

diff --git a/ChangeLog b/ChangeLog
index f298da0db7..1c3b8fadea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-21  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lily/main.cc (setup_paths): Prepend dirs to search path, instead
+	of appending.  Fixes build when typical LilyPond 1.4 leftovers clutter
+	the system.
+
+	* flower/include/file-path.hh (prepend): New function.
+
 2002-08-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* Documentation/misc/ChangeLog-1.5: move 1.5 ChangeLog to misc/
diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index b3bf47d5aa..2055d08f01 100644
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -39,6 +39,7 @@ public:
   String find (String nm) const;
 
   Array<String>::push;
+  void prepend (String str) { Array<String>::insert (str, 0); }
   String string ()const;
   bool try_add (String str);
   void add (String);
diff --git a/lily/main.cc b/lily/main.cc
index 3375142449..dd856b5a81 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -263,7 +263,7 @@ setup_paths ()
     for (char **s = suffixes; *s; s++)
       {
 	String p = prefix_directory[i] + to_string ('/') + String (*s);
-	global_path.add (p);
+	global_path.prepend (p);
 	
 #if !KPATHSEA
 	/* Urg: GNU make's $ (word) index starts at 1 */