diff options
| author | Robert Tari <robert@tari.in> | 2021-06-08 23:32:05 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-06-08 23:32:05 +0200 |
| commit | dea96ddc132b8e41fca53a3b4d72cb4a9462202d (patch) | |
| tree | 7193e527be8a5a4145629fa3ec9936f4bcc0c671 /data | |
| parent | 912f071d8a27dd547bc39e8763af155d9cdd0b47 (diff) | |
| download | libayatana-indicator-dea96ddc132b8e41fca53a3b4d72cb4a9462202d.tar.gz libayatana-indicator-dea96ddc132b8e41fca53a3b4d72cb4a9462202d.tar.bz2 libayatana-indicator-dea96ddc132b8e41fca53a3b4d72cb4a9462202d.zip | |
Use CMAKE_INSTALL_FULL_*DIR locations
Diffstat (limited to 'data')
| -rw-r--r-- | data/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/ayatana-indicator.pc.in | 10 | ||||
| -rw-r--r-- | data/ayatana-indicator3-no-IDO.pc.in | 10 | ||||
| -rw-r--r-- | data/ayatana-indicator3.pc.in | 10 |
4 files changed, 18 insertions, 18 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 2a60d05..74b48e6 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -6,10 +6,10 @@ if (FLAVOUR_GTK3) else() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator3-no-IDO.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator3-0.${API_VERSION}.pc" @ONLY) endif() - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator3-0.${API_VERSION}.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator3-0.${API_VERSION}.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/") else() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-0.${API_VERSION}.pc" @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-0.${API_VERSION}.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-0.${API_VERSION}.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/") endif() # ayatana-indicators.target (only required once, so let's do it with FLAVOUR_GTK3) @@ -20,7 +20,7 @@ if (FLAVOUR_GTK3) if (${SYSTEMD_FOUND}) if (${SYSTEMD_VERSION} VERSION_LESS 247) - set(SYSTEMD_USER_UNIT_DIR ${CMAKE_INSTALL_PREFIX}/lib/systemd/user) + set(SYSTEMD_USER_UNIT_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/systemd/user") else() pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir) endif() diff --git a/data/ayatana-indicator.pc.in b/data/ayatana-indicator.pc.in index e4f06a2..9f58b70 100644 --- a/data/ayatana-indicator.pc.in +++ b/data/ayatana-indicator.pc.in @@ -1,10 +1,10 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -bindir=${exec_prefix}/@CMAKE_INSTALL_BINDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -indicatordir=${exec_prefix}/lib/ayatana-indicators/@ABI_VERSION@/ -iconsdir=${prefix}/@CMAKE_INSTALL_DATADIR@/@PROJECT_NAME@/icons/ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +bindir=@CMAKE_INSTALL_FULL_BINDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ +indicatordir=@CMAKE_INSTALL_FULL_LIBDIR@/ayatana-indicators/@ABI_VERSION@/ +iconsdir=@CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/icons/ Cflags: -I${includedir}/libayatana-indicator-0.@API_VERSION@ Requires: gtk+-2.0 diff --git a/data/ayatana-indicator3-no-IDO.pc.in b/data/ayatana-indicator3-no-IDO.pc.in index 231fa71..4ded484 100644 --- a/data/ayatana-indicator3-no-IDO.pc.in +++ b/data/ayatana-indicator3-no-IDO.pc.in @@ -1,10 +1,10 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -bindir=${exec_prefix}/@CMAKE_INSTALL_BINDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -indicatordir=${exec_prefix}/lib/ayatana-indicators3/@ABI_VERSION@/ -iconsdir=${prefix}/@CMAKE_INSTALL_DATADIR@/@PROJECT_NAME@/icons/ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +bindir=@CMAKE_INSTALL_FULL_BINDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ +indicatordir=@CMAKE_INSTALL_FULL_LIBDIR@/ayatana-indicators3/@ABI_VERSION@/ +iconsdir=@CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/icons/ Cflags: -I${includedir}/libayatana-indicator3-0.@API_VERSION@ Requires: gtk+-3.0 diff --git a/data/ayatana-indicator3.pc.in b/data/ayatana-indicator3.pc.in index 6941827..46434f5 100644 --- a/data/ayatana-indicator3.pc.in +++ b/data/ayatana-indicator3.pc.in @@ -1,10 +1,10 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -bindir=${exec_prefix}/@CMAKE_INSTALL_BINDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -indicatordir=${exec_prefix}/lib/ayatana-indicators3/@ABI_VERSION@/ -iconsdir=${prefix}/@CMAKE_INSTALL_DATADIR@/@PROJECT_NAME@/icons/ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +bindir=@CMAKE_INSTALL_FULL_BINDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ +indicatordir=@CMAKE_INSTALL_FULL_LIBDIR@/ayatana-indicators3/@ABI_VERSION@/ +iconsdir=@CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/icons/ Cflags: -I${includedir}/libayatana-indicator3-0.@API_VERSION@ Requires: gtk+-3.0 libayatana-ido3-0.4 |