>>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:
Angus> PACKAGE is hardcoded in config.h. Eg "lyx" or "lyx-1.3.6cvs".
Angus> If people specify PACKAGE as something other than "lyx", then
Angus> shouldn't their choice be respected?
Respect? What's that?
The idea was to change that into LyX or LyX-1.3.6cvs.
Angus> I don't know how important this is. Basically, I'm just
Angus> thinking out aloud...
I do not know either. But I guess you have a point.
What about the following patches (pick one)? What about 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:42:44 -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);
+ string const user_dir = (string(PACKAGE) == "lyx") ? "LyX" : PACKAGE;
+ return AddPath(reinterpret_cast<char const *>(store), user_dir);
#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:42:31 -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"
+ test $PACKAGE = "lyx" && PACKAGE=LyX
+ default_prefix="/Applications/LyX.app"
bindir='${prefix}/Contents/MacOS'
libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources'
