diff options
| author | Pierre Ossman <ossman@cendio.se> | 2019-02-01 13:24:20 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2020-03-12 12:03:52 +0100 |
| commit | e4f253e1d1e1851bce3ea4a5511622696daf6d06 (patch) | |
| tree | f1fee3aaf1feca1c040f2fc8fcf31a8310d023ba /vncviewer | |
| parent | 7694f9b4aae475a7b5985e0e960e21c5869f64cf (diff) | |
| download | tigervnc-e4f253e1d1e1851bce3ea4a5511622696daf6d06.tar.gz tigervnc-e4f253e1d1e1851bce3ea4a5511622696daf6d06.zip | |
Use standard install dir variable names
This makes our builds directly compatible with most distributions
without packagers/users having to specify extra flags.
Diffstat (limited to 'vncviewer')
| -rw-r--r-- | vncviewer/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | vncviewer/vncviewer.cxx | 4 | ||||
| -rw-r--r-- | vncviewer/vncviewer.desktop.in.in | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt index caf6d7a8..a2048f29 100644 --- a/vncviewer/CMakeLists.txt +++ b/vncviewer/CMakeLists.txt @@ -61,9 +61,9 @@ if(APPLE) target_link_libraries(vncviewer "-framework IOKit") endif() -install(TARGETS vncviewer DESTINATION ${BIN_DIR}) +install(TARGETS vncviewer DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) if(UNIX) - install(FILES vncviewer.man DESTINATION ${MAN_DIR}/man1 RENAME vncviewer.1) + install(FILES vncviewer.man DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1 RENAME vncviewer.1) configure_file(vncviewer.desktop.in.in vncviewer.desktop.in) find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge) @@ -92,10 +92,10 @@ if(UNIX) ) endif() add_custom_target(desktop ALL DEPENDS vncviewer.desktop) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop DESTINATION ${DATA_DIR}/applications) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications) foreach(res 16 22 24 32 48) - install(FILES ../media/icons/tigervnc_${res}.png DESTINATION ${DATA_DIR}/icons/hicolor/${res}x${res}/apps RENAME tigervnc.png) + install(FILES ../media/icons/tigervnc_${res}.png DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${res}x${res}/apps RENAME tigervnc.png) endforeach() - install(FILES ../media/icons/tigervnc.svg DESTINATION ${DATA_DIR}/icons/hicolor/scalable/apps) + install(FILES ../media/icons/tigervnc.svg DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/scalable/apps) endif() diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx index 32278bc1..39a267c0 100644 --- a/vncviewer/vncviewer.cxx +++ b/vncviewer/vncviewer.cxx @@ -227,7 +227,7 @@ static void init_fltk() bool exists; sprintf(icon_path, "%s/icons/hicolor/%dx%d/apps/tigervnc.png", - DATA_DIR, icon_sizes[i], icon_sizes[i]); + CMAKE_INSTALL_FULL_DATADIR, icon_sizes[i], icon_sizes[i]); #ifndef WIN32 struct stat st; @@ -505,7 +505,7 @@ int main(int argc, char** argv) argv0 = argv[0]; setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE_NAME, LOCALE_DIR); + bindtextdomain(PACKAGE_NAME, CMAKE_INSTALL_FULL_LOCALEDIR); textdomain(PACKAGE_NAME); rfb::SecurityClient::setDefaults(); diff --git a/vncviewer/vncviewer.desktop.in.in b/vncviewer/vncviewer.desktop.in.in index d775ddec..9d658e44 100644 --- a/vncviewer/vncviewer.desktop.in.in +++ b/vncviewer/vncviewer.desktop.in.in @@ -2,7 +2,7 @@ Name=TigerVNC Viewer GenericName=Remote Desktop Viewer Comment=Connect to VNC server and display remote desktop -Exec=@BIN_DIR@/vncviewer +Exec=@CMAKE_INSTALL_FULL_BINDIR@/vncviewer Icon=tigervnc Terminal=false Type=Application |