Cmake build: Specify the correct value of 'PACKAGE' define in config.h

This was wrong in case where no program suffix was allowed
Spotted by Scott.
This commit is contained in:
Kornel Benko 2016-08-03 12:09:04 +02:00
parent 16d39b1f83
commit 4f1095cdbc

View File

@ -461,7 +461,14 @@ else()
set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}") set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
endif() endif()
if(LYX_PACKAGE_SUFFIX) # The define below allows lyx-executable to find its default configuration files
# see routines
# Package::messages_file()
# get_default_user_support_dir()
# relative_system_support_dir()
# in src/support/Package.cpp
#
if(LYX_PROGRAM_SUFFIX)
set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX}) set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
else() else()
set(PACKAGE ${PACKAGE_BASE}) set(PACKAGE ${PACKAGE_BASE})