>>>>> "Bennett" == Bennett Helm <[EMAIL PROTECTED]> writes:
>> What about changing "lyx" to "LyX" in PACKAGE? This will work with
>> version suffix stuff.
Bennett> That would be great.
OK, here are two patches:
lyxosx.diff changes lyx to LyX in PACKAGE only for the determination
of the use directory. It is the least intrusive solution.
lyxosx-config.diff changes the PACKAGE variable in configure itself
(you need to run autogen.sh). Many things will be changed (binary
name, ...).
Could you test those two approaches? Which one is the best?
Angus, do you think we should do the same (at least the first one) to
Windows?
JMarc
Index: src/support/package.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Attic/package.C,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 package.C
--- src/support/package.C 22 Apr 2005 20:32:57 -0000 1.1.2.5
+++ src/support/package.C 11 Jul 2005 12:05:55 -0000
@@ -608,7 +608,8 @@ string const get_default_user_support_di
if (status_code != 0)
return string();
- return AddPath(reinterpret_cast<char const *>(store), PACKAGE);
+ return AddPath(reinterpret_cast<char const *>(store),
+ subst(PACKAGE, "lyx", "LyX");
#else // USE_POSIX_PACKAGING
return AddPath(home_dir, string(".") + PACKAGE);
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.81.2.7
diff -u -p -r1.81.2.7 lyxinclude.m4
--- config/lyxinclude.m4 4 Feb 2005 09:14:24 -0000 1.81.2.7
+++ config/lyxinclude.m4 11 Jul 2005 12:11:54 -0000
@@ -673,7 +673,8 @@ AC_ARG_WITH(packaging,
AC_MSG_RESULT($lyx_use_packaging)
case $lyx_use_packaging in
macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
- default_prefix="/Applications/LyX.app"
+ PACKAGE=`echo $PACKAGE | sed s/lyx/LyX/`
+ default_prefix="/Applications/LyX.app"
bindir='${prefix}/Contents/MacOS'
libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources'
