* 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 f298da0db79a2b02099de1fa10333fec72157541..1c3b8fadeac30e0baac8f68795fa90b84ab81742 100644 (file)
--- 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 b3bf47d5aa8e16344c315d202bd0c343ad4a57c9..2055d08f011c35415ce7f757fbfcda7d31587cd8 100644 (file)
--- 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 3375142449239b40e8baffc8f95c8ef63c1f3ef1..dd856b5a810d78b748a851e8fde2f1374409c208 100644 (file)
--- 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 */