From aade5eaab9ddc9b948db6edbb0d43a6f4a691fda Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 13 Feb 2006 11:25:46 +0000
Subject: [PATCH] remove @FRAMEWORKDIR@
---
ChangeLog | 2 ++
config.hh.in | 3 ---
lily/relocate.cc | 4 +++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ea7dc72163..0b21fcc630 100644
--- 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 6e7d0dc8db..7b90ae3444 100644
--- 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 8a2d724387..1f30331e0f 100644
--- 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)
{
--
2.39.5