Merge branch 'jb50027' into 'master'

[aarch64] Use macros, not hardcoded paths. Contributes to JB#50027 See merge request mer-core/timed!21
sailfishos · May 28, 2020 · c694b5e · c694b5e
2 parents 5b75ada + 06746a3
commit c694b5e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/rpm/timed-qt5.spec b/rpm/timed-qt5.spec
@@ -70,9 +70,9 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 %qmake5_install
 
-# The file %{buildroot}/lib/systemd/user/%{name}.service is installed by make install
-install -d %{buildroot}%{_libdir}/systemd/user/pre-user-session.target.wants/
-ln -s ../%{name}.service %{buildroot}%{_libdir}/systemd/user/pre-user-session.target.wants/%{name}.service
+# The file %{buildroot}%{_userunitdir}/%{name}.service is installed by make install
+install -d %{buildroot}%{_userunitdir}/pre-user-session.target.wants/
+ln -s ../%{name}.service %{buildroot}%{_userunitdir}/pre-user-session.target.wants/%{name}.service
 
 mkdir -p %{buildroot}%{_datadir}/mapplauncherd/privileges.d
 install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d/
@@ -124,8 +124,8 @@ fi
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/libtimed-voland-qt5.so.*
 %{_datadir}/mapplauncherd/privileges.d/*
-%{_libdir}/systemd/user/%{name}.service
-%{_libdir}/systemd/user/pre-user-session.target.wants/%{name}.service
+%{_userunitdir}/%{name}.service
+%{_userunitdir}/pre-user-session.target.wants/%{name}.service
 %{_oneshotdir}/setcaps-%{name}.sh
 %dir %attr(0775,-,timed) /var/lib/timed
 %dir %attr(02770,root,sailfish-alarms) /var/lib/timed/shared_events

diff --git a/src/lib/lib.pro b/src/lib/lib.pro
@@ -14,7 +14,7 @@ SOURCES += wall-settings.cpp wall-info.cpp qmacro.cpp
 
 LIBS += -lrt
 
-target.path = /usr/lib
+target.path = $$[QT_INSTALL_LIBS]
 
 devheaders.files += hidden/exception exception.h qmacro.h
 devheaders.files += interface interface.h
@@ -23,7 +23,7 @@ devheaders.files += wallclock wall-declarations.h
 devheaders.path = /usr/include/timed-qt5
 devheaders.path  = /usr/include/$$TARGET
 
-pc.path = /usr/lib/pkgconfig
+pc.path = $$[QT_INSTALL_LIBS]/pkgconfig
 pc.files = timed-qt5.pc
 
 prf.path =  $$[QT_INSTALL_DATA]/mkspecs/features

diff --git a/src/voland/voland.pro b/src/voland/voland.pro
@@ -11,12 +11,12 @@ SOURCES = interface.cpp reminder-pimple.cpp
 
 INCLUDEPATH += ../h
 
-target.path = /usr/lib
+target.path = $$[QT_INSTALL_LIBS]
 
 devheaders.files = reminder interface ta_interface reminder.h interface.h
 devheaders.path  = /usr/include/timed-voland-qt5
 
-pc.path = /usr/lib/pkgconfig
+pc.path = $$[QT_INSTALL_LIBS]/pkgconfig
 pc.files = timed-voland-qt5.pc
 
 prf.path =  $$[QT_INSTALL_DATA]/mkspecs/features