From 02e822110faf7ae0276fba03a8bea469ce8c9ef9 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 15 Jul 2005 15:57:10 +0000 Subject: [PATCH] use LyX instead of lyx for user directory on windows and osx git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10215 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/ChangeLog | 5 +++++ src/support/package.C | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 83a3eed8a9..65a54e5cec 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2005-07-12 Jean-Marc Lasgouttes + + * package.C (get_default_user_support_dir): for windows and osx + packaging, use "LyX" instead of "lyx" as subdirectory name. + 2005-07-14 Angus Leeming * filetools.[Ch] (mangled_filename): backport the 1.4.x name mangling diff --git a/src/support/package.C b/src/support/package.C index 7ea6bb9422..bf29549d96 100644 --- a/src/support/package.C +++ b/src/support/package.C @@ -589,7 +589,8 @@ string const get_default_user_support_dir(string const & home_dir) #if defined (USE_WINDOWS_PACKAGING) (void)home_dir; // Silence warning about unused variable. - return AddPath(win32_folder_path(CSIDL_APPDATA), PACKAGE); + string const user_dir = (string(PACKAGE) == "lyx") ? "LyX" : PACKAGE; + return AddPath(win32_folder_path(CSIDL_APPDATA), user_dir); #elif defined (USE_MACOSX_PACKAGING) (void)home_dir; // Silence warning about unused variable. @@ -608,7 +609,8 @@ string const get_default_user_support_dir(string const & home_dir) if (status_code != 0) return string(); - return AddPath(reinterpret_cast(store), PACKAGE); + string const user_dir = (string(PACKAGE) == "lyx") ? "LyX" : PACKAGE; + return AddPath(reinterpret_cast(store), user_dir); #else // USE_POSIX_PACKAGING return AddPath(home_dir, string(".") + PACKAGE);