Enrico Forestieri wrote:
> On Wed, Jul 14, 2010 at 10:13:37AM +0200, Kornel Benko wrote:
>> Am Mittwoch 14 Juli 2010 schrieb Joost Verburg:
>>> On 7/13/2010 6:12 PM, Joost Verburg wrote:
>>>> I think this should definitely be fixed for 1.6.8 but maybe we can go
>>>> ahead now with 1.6.7.
>>> Just discovered another issue. The user directory suffix for the 1.6
>>> series has always been "16" (directory called lyx16), while CMake sets
>>> it to "1.6" (directory called LyX1.6). There should be an option to
>>> change this otherwise user preferences will not be preserved.
>>>
>>> Joost
>> Don't understand. The _user_ directory is "~/.lyx" without setting
>> environmate variables.
>
> That's wrong. On posix systems, the user directory is ~/.PACKAGE, where
> PACKAGE=lyx if you don't use --with-version-suffix at configure time,
> otherwise the suffix is appended to the string "lyx". Moreover, PACKAGE
> also sets the text domain for translations, such that you can have
> different translation files for different suffixes.
>
Is it OK when I set PACKAGE to 'LyX16' instead 'LyX1.6' on Windows?
Peter
Index: development/cmake/CMakeLists.txt
===================================================================
--- development/cmake/CMakeLists.txt (Revision 34893)
+++ development/cmake/CMakeLists.txt (Arbeitskopie)
@@ -113,6 +113,7 @@
set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
set(LYX_INSTALL_SUFFIX "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
+ set(LYX_INSTALL_SUFFIX_DOTLESS "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
endif()
endif()
if(_c_l MATCHES "^AC_SUBST\\( *LYX_DATE *, *\\[\\\"(.*)\\\"\\].*")
@@ -122,7 +123,11 @@
if(LYX_PACKAGE_SUFFIX)
- set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
+ if(WIN32)
+ set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX_DOTLESS})
+ else()
+ set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
+ endif()
else()
set(PACKAGE ${PACKAGE_BASE})
endif()
