change KATIE_TRANSLATIONS_FULL, KATIE_LDCONF_FULL and KATIE_PROFILE_FULL defaults to common values [ci skip]

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-29 09:51:38 +00:00
parent 9d4850cb0e
commit 5657c86ed0
4 changed files with 5 additions and 14 deletions

View file

@ -95,11 +95,11 @@ set(KATIE_BINARIES_FULL "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Binaries inst
set(KATIE_PLUGINS_FULL "${KATIE_LIBRARIES_FULL}/katie/plugins" CACHE PATH "Plugins installation path")
set(KATIE_IMPORTS_FULL "${KATIE_LIBRARIES_FULL}/katie/imports" CACHE PATH "Declerative imports installation path")
set(KATIE_DATA_FULL "${CMAKE_INSTALL_FULL_DATADIR}" CACHE PATH "Generic data installation path")
set(KATIE_TRANSLATIONS_FULL "${KATIE_DATA_FULL}/translations" CACHE PATH "Translations instllation path")
set(KATIE_TRANSLATIONS_FULL "${KATIE_DATA_FULL}/katie/translations" CACHE PATH "Translations instllation path")
set(KATIE_SETTINGS_FULL "${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg" CACHE PATH "Settings runtime path")
set(KATIE_CMAKE_FULL "${KATIE_LIBRARIES_FULL}/cmake/Katie" CACHE PATH "CMake aware modules installation path")
set(KATIE_LDCONF_FULL "${KATIE_DATA_FULL}/ld.so.conf.d" CACHE PATH "Run-time linker/loader configs installation path")
set(KATIE_PROFILE_FULL "${KATIE_DATA_FULL}/profile.d" CACHE PATH "Shell profile scripts installation path")
set(KATIE_LDCONF_FULL "${CMAKE_INSTALL_FULL_SYSCONFDIR}/ld.so.conf.d" CACHE PATH "Run-time linker/loader configs installation path")
set(KATIE_PROFILE_FULL "${CMAKE_INSTALL_FULL_SYSCONFDIR}/profile.d" CACHE PATH "Shell profile scripts installation path")
set(KATIE_MAN_FULL "${CMAKE_INSTALL_FULL_MANDIR}" CACHE PATH "Manual pages installation path")
set(KATIE_APPLICATIONS_FULL "${KATIE_DATA_FULL}/applications" CACHE PATH "Desktop applications register installation path")
set(KATIE_PIXMAPS_FULL "${KATIE_DATA_FULL}/pixmaps" CACHE PATH "Desktop applications icon installation path")

View file

@ -15,9 +15,6 @@ override_dh_shlibdeps:
override_dh_auto_configure:
dh_auto_configure -- -Wno-dev \
-DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \
-DKATIE_SETTINGS_FULL=/etc/xdg \
-DKATIE_PROFILE_FULL=/etc/profile.d \
-DKATIE_TOOLS_SUFFIX="-katie" \
-DKATIE_ALLINONE=OFF \
-DKATIE_CROSS_EXEC=$(KATIE_CROSS_EXEC)

View file

@ -15,8 +15,5 @@ export CXXFLAGS="$CXXFLAGS -Wall -fsanitize=$sanitizers -fno-omit-frame-pointer
export LDFLAGS="$LDFLAGS -Wall -fsanitize=$sanitizers"
cmake ../ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=/usr \
-DKATIE_SETTINGS_FULL=/etc/xdg \
-DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \
-DKATIE_PROFILE_FULL=/etc/profile.d $@
-DCMAKE_INSTALL_PREFIX=/usr $@
make -j$(nproc || echo 1)

View file

@ -11,8 +11,5 @@ cd "$cwd/../minsize"
export CFLAGS="$CFLAGS -flto -fno-exceptions" CXXFLAGS="$CXXFLAGS -flto -fno-exceptions"
cmake ../ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DKATIE_SETTINGS_FULL=/etc/xdg \
-DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \
-DKATIE_PROFILE_FULL=/etc/profile.d $@
-DCMAKE_INSTALL_PREFIX=/usr $@
make -j$(nproc || echo 1)