remove @FRAMEWORKDIR@

diff --git a/ChangeLog b/ChangeLog
index ea7dc7216341ca0d0386f5fc4cd54a67c3b6aa24..0b21fcc6300a5f1f9a5d5cf535f9c6d9a4eeaf5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-02-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * config.hh.in: remove @FRAMEWORKDIR@
+
        * lily/system-start-text.cc (get_stencil): new file: separate out
        system-start-delimiter text support.
 

diff --git a/config.hh.in b/config.hh.in
index 6e7d0dc8db391d0a258b95d5c0d80e5f680dcb17..7b90ae3444685265d32a46ce701dd08243a15d55 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -10,9 +10,6 @@
 /* dynamic relocation? */
 #define ARGV0_RELOCATION 0
 
-/* framework prefix, usually ".." */
-#define FRAMEWORKDIR "@FRAMEWORKDIR@"
-
 /* default lilypond locale dir */
 #define LOCALEDIR "@LOCALEDIR@"
 

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 8a2d72438714d951d99562c23c90bb4943c0dabe..1f30331e0f3e03e66f9873f411eeb65a1400b9b6 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -27,6 +27,8 @@
 #include "version.hh"
 #include "warn.hh"
 
+const char * FRAMEWORKDIR = "..";
+
 
 int
 sane_putenv (char const *key, string value, bool overwrite)
@@ -198,7 +200,7 @@ setup_paths (char const *argv0_ptr)
 #endif /* __MINGW32__ */
       prefix_relocation (prefix);
       string bindir = prefix + "/bin";
-      framework_relocation (bindir + "/" FRAMEWORKDIR);
+      framework_relocation (bindir);
     }
   else if (relocate_binary)
     {