From ca5dc697b17b4cb724dc5b82fa8410621a74a11a Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Wed, 4 Aug 2021 00:51:47 +0200
Subject: Whitespace fix

---
 data/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ddfa2ad..2a1549b 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -81,13 +81,13 @@ set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
 set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
 
 install(FILES org.ayatana.indicator.sound.AccountsService.xml
-	DESTINATION "${DBUS_IFACE_DIR}"
+    DESTINATION "${DBUS_IFACE_DIR}"
 )
 
 # Create accountsservice symlink for above dbus interface
 install(CODE "
-	execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
-	execute_process(COMMAND ln -sf ../../dbus-1/interfaces/org.ayatana.indicator.sound.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
+    execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
+    execute_process(COMMAND ln -sf ../../dbus-1/interfaces/org.ayatana.indicator.sound.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
 ")
 
 install(FILES org.ayatana.indicator.sound.AccountsService.policy
@@ -126,4 +126,4 @@ else()
   install(FILES 50-org.ayatana.AccountsService.Sound.pkla
   DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d"
   )
-endif()
\ No newline at end of file
+endif()
-- 
cgit v1.2.3


From a1c03e0a0f2e862f57f2f733067f2c0927568b98 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Wed, 4 Aug 2021 22:46:47 +0200
Subject: Use CMAKE_INSTALL_FULL_*DIR locations for installation

---
 CMakeLists.txt      |  2 +-
 data/CMakeLists.txt | 10 +++++-----
 src/CMakeLists.txt  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4905022..49c193f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ include(UseVala)
 option (enable_tests "Build the package's automatic tests." ON)
 
 set(GETTEXT_PACKAGE "ayatana-indicator-sound")
-set(LOCALEDIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
+set(LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")
 add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" )
 
 set(SOURCE_DIR "${CMAKE_SOURCE_DIR}/src")
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2a1549b..e9ed905 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(GSettings)
 
 set(
   INDICATOR_DIR
-  "${CMAKE_INSTALL_DATADIR}/ayatana/indicators"
+  "${CMAKE_INSTALL_FULL_DATADIR}/ayatana/indicators"
   CACHE FILEPATH "Ayatana Indicators Directory"
 )
 
@@ -75,10 +75,10 @@ endif()
 #########################################
 
 
-set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
-set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
-set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
-set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
+set(POLKIT_LIB_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/polkit-1")
+set(POLKIT_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}/polkit-1")
+set(DBUS_IFACE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/interfaces")
+set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/accountsservice/interfaces")
 
 install(FILES org.ayatana.indicator.sound.AccountsService.xml
     DESTINATION "${DBUS_IFACE_DIR}"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60eb961..fb6e422 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -338,7 +338,7 @@ target_link_libraries(
 
 install(
   TARGETS indicator-sound-service-bin
-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/ayatana-indicator-sound/
+  RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-indicator-sound/
 )
 
 if(UNITY_API_FOUND)
-- 
cgit v1.2.3