mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-04-05 08:17:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
aports/testing/lomiri-download-manager/0001-Use-CMAKE_INSTALL_FULL_-for-installing.patch

218 lines
10 KiB
Diff
Raw Permalink Blame History

From 58412c9afc9e6caa0fc1f848958ae1e4631dd1a2 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 31 Jan 2024 22:45:49 +0100
Subject: [PATCH 1/3] Use CMAKE_INSTALL_FULL_* for installing
While I don't think there should be a difference between the two
variables for most cases, for SYSCONFDIR we might end up installing into
/usr/etc/ if we don't use the FULL_SYSCONFDIR variable.
---
CMakeLists.txt | 2 +-
docs/CMakeLists.txt | 2 +-
docs/man/CMakeLists.txt | 2 +-
docs/qml/CMakeLists.txt | 2 +-
po/CMakeLists.txt | 2 +-
src/common/priv/CMakeLists.txt | 2 +-
src/common/public/CMakeLists.txt | 8 ++++----
src/downloads/client/CMakeLists.txt | 6 +++---
src/downloads/common/CMakeLists.txt | 6 +++---
src/downloads/daemon/CMakeLists.txt | 8 ++++----
src/downloads/priv/CMakeLists.txt | 2 +-
src/extractor/CMakeLists.txt | 2 +-
src/uploads/common/CMakeLists.txt | 6 +++---
src/uploads/daemon/CMakeLists.txt | 8 ++++----
14 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c4750a2..c183b3d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
ENABLE_COVERAGE_REPORT(TARGETS ${DIALER_APP})
ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
-set(QT_INSTALL_QML "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
+set(QT_INSTALL_QML "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml")
set(LDM_VERSION_MAJOR 0)
set(LDM_VERSION_MINOR 1)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 059b8797..0658acaa 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -28,7 +28,7 @@ if(DOXYGEN_FOUND)
COMMENT "Generating API documentation with Doxygen" VERBATIM)
install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
- DESTINATION ${CMAKE_INSTALL_DOCDIR}/cpp)
+ DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR}/cpp)
add_dependencies(doc cppdoc)
endif(DOXYGEN_FOUND)
diff --git a/docs/man/CMakeLists.txt b/docs/man/CMakeLists.txt
index d51c7a65..1e17c01e 100644
--- a/docs/man/CMakeLists.txt
+++ b/docs/man/CMakeLists.txt
@@ -2,5 +2,5 @@ install(
FILES
lomiri-download-manager.1
lomiri-upload-manager.1
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/
+ DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1/
)
diff --git a/docs/qml/CMakeLists.txt b/docs/qml/CMakeLists.txt
index 8fd39d22..26579b02 100644
--- a/docs/qml/CMakeLists.txt
+++ b/docs/qml/CMakeLists.txt
@@ -31,7 +31,7 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/css"
install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
- DESTINATION ${CMAKE_INSTALL_DOCDIR}/qml/html
+ DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR}/qml/html
)
add_dependencies(doc qmldoc)
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index f5c1f3ed..ae887c7c 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -21,7 +21,7 @@ add_custom_target(${POT_FILE}
foreach(PO_FILE ${PO_FILES})
get_filename_component(LANG ${PO_FILE} NAME_WE)
gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
- set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+ set(INSTALL_DIR ${CMAKE_INSTALL_FULL_LOCALEDIR}/${LANG}/LC_MESSAGES)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
DESTINATION ${INSTALL_DIR}
RENAME ${DOMAIN}.mo)
diff --git a/src/common/priv/CMakeLists.txt b/src/common/priv/CMakeLists.txt
index e7723f3d..fe0596a4 100644
--- a/src/common/priv/CMakeLists.txt
+++ b/src/common/priv/CMakeLists.txt
@@ -83,4 +83,4 @@ target_link_libraries(${TARGET}
ldm-common
)
-install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
diff --git a/src/common/public/CMakeLists.txt b/src/common/public/CMakeLists.txt
index 4b1e8660..95738aa7 100644
--- a/src/common/public/CMakeLists.txt
+++ b/src/common/public/CMakeLists.txt
@@ -57,7 +57,7 @@ target_link_libraries(${TARGET}
configure_file(${TARGET}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES ${TRANSFERS_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lomiri/transfers)
-install(FILES ${ERRORS_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lomiri/transfers/errors)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+install(FILES ${TRANSFERS_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/lomiri/transfers)
+install(FILES ${ERRORS_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/lomiri/transfers/errors)
diff --git a/src/downloads/client/CMakeLists.txt b/src/downloads/client/CMakeLists.txt
index d622434c..79ae0d34 100644
--- a/src/downloads/client/CMakeLists.txt
+++ b/src/downloads/client/CMakeLists.txt
@@ -71,6 +71,6 @@ target_link_libraries(${TARGET}
configure_file(${TARGET}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lomiri/download_manager)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/lomiri/download_manager)
diff --git a/src/downloads/common/CMakeLists.txt b/src/downloads/common/CMakeLists.txt
index 23fa1482..448e773a 100644
--- a/src/downloads/common/CMakeLists.txt
+++ b/src/downloads/common/CMakeLists.txt
@@ -47,6 +47,6 @@ target_link_libraries(${TARGET}
configure_file(${TARGET}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lomiri/download_manager)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/lomiri/download_manager)
diff --git a/src/downloads/daemon/CMakeLists.txt b/src/downloads/daemon/CMakeLists.txt
index cdc9f83b..a0e94a74 100644
--- a/src/downloads/daemon/CMakeLists.txt
+++ b/src/downloads/daemon/CMakeLists.txt
@@ -43,9 +43,9 @@ if(USE_SYSTEMD)
endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.service DESTINATION
- ${CMAKE_INSTALL_DATADIR}/dbus-1/services)
+ ${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.lomiri.applications.Downloader.service DESTINATION
- ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services)
+ ${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/system-services)
install(FILES com.lomiri.applications.Downloader.conf DESTINATION
- ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d)
-install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
diff --git a/src/downloads/priv/CMakeLists.txt b/src/downloads/priv/CMakeLists.txt
index 9eaf3092..40b1093d 100644
--- a/src/downloads/priv/CMakeLists.txt
+++ b/src/downloads/priv/CMakeLists.txt
@@ -49,7 +49,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
-add_definitions(-DHELPER_DIR="${CMAKE_INSTALL_LIBEXECDIR}/lomiri-download-manager")
+add_definitions(-DHELPER_DIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}/lomiri-download-manager")
add_library(${TARGET} STATIC
${HEADERS}
diff --git a/src/extractor/CMakeLists.txt b/src/extractor/CMakeLists.txt
index 8c40b9b5..9efc64ed 100644
--- a/src/extractor/CMakeLists.txt
+++ b/src/extractor/CMakeLists.txt
@@ -29,4 +29,4 @@ target_link_libraries(${TARGET}
ldm-priv-common
)
-install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/lomiri-download-manager)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}/lomiri-download-manager)
diff --git a/src/uploads/common/CMakeLists.txt b/src/uploads/common/CMakeLists.txt
index 0729445f..aa444553 100644
--- a/src/uploads/common/CMakeLists.txt
+++ b/src/uploads/common/CMakeLists.txt
@@ -41,6 +41,6 @@ target_link_libraries(${TARGET}
configure_file(${TARGET}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lomiri/upload_manager)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/lomiri/upload_manager)
diff --git a/src/uploads/daemon/CMakeLists.txt b/src/uploads/daemon/CMakeLists.txt
index 157c6fd6..9731899d 100644
--- a/src/uploads/daemon/CMakeLists.txt
+++ b/src/uploads/daemon/CMakeLists.txt
@@ -43,9 +43,9 @@ if(USE_SYSTEMD)
endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.service DESTINATION
- ${CMAKE_INSTALL_DATADIR}/dbus-1/services)
+ ${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.lomiri.applications.Uploader.service DESTINATION
- ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services)
+ ${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/system-services)
install(FILES com.lomiri.applications.Uploader.conf DESTINATION
- ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d)
-install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
--
2.48.0
Reference in a new issue View git blame Copy permalink