Merge branch 'jb49681' into 'master'

Use qmake properties instead of hardcoded paths. See merge request mer-core/sensorfw!53
sailfishos · May 29, 2020 · 89ed1ef · 89ed1ef
2 parents d223121 + d436b43
commit 89ed1ef
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/common-install.pri b/common-install.pri
@@ -9,9 +9,9 @@ QT -= gui
 
 # Path for headers - remember to add files if they should be installed
 publicheaders.path = /usr/include/sensord-qt5
-PLUGINPATH = /usr/lib/sensord-qt5
+PLUGINPATH = $$[QT_INSTALL_LIBS]/sensord-qt5
 
 # Path for shared libraries
-SHAREDLIBPATH = /usr/lib
+SHAREDLIBPATH = $$[QT_INSTALL_LIBS]
 
 INSTALLS += publicheaders
diff --git a/core/core.pro b/core/core.pro
@@ -15,6 +15,8 @@ SENSORFW_INCLUDEPATHS = .. \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
+DEFINES += PLUGIN_DIRECTORY=\"\\\"$$[QT_INSTALL_LIBS]/sensord-qt5\\\"\"
+
 QMAKE_LIBDIR_FLAGS += -L../datatypes\
                       -lsensordatatypes-qt5
 

diff --git a/core/hybris.pro b/core/hybris.pro
@@ -17,7 +17,7 @@ QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
 
 SOURCES += hybrisadaptor.cpp
 HEADERS += hybrisadaptor.h
-LIBS += -L/usr/lib -L../datatypes
+LIBS += -L$$[QT_INSTALL_LIBS] -L../datatypes
 
 !contains(CONFIG,binder) {
     LIBS += -lhybris-common -lhardware

diff --git a/core/loader.cpp b/core/loader.cpp
@@ -54,7 +54,6 @@ Loader& Loader::instance()
 }
 
 #define PLUGIN_PREFIX_ENV "SENSORFW_LIBRARY_PATH"
-#define PLUGIN_DIRECTORY  "/usr/lib/sensord-qt5"
 #define PLUGIN_PREFIX     "lib"
 #define PLUGIN_SUFFIX     "-qt5.so"
 #define SENSOR_SUFFIX     "sensor"

diff --git a/rpm/sensorfw-qt5-hybris.inc b/rpm/sensorfw-qt5-hybris.inc
@@ -37,7 +37,7 @@ Development headers for sensor framework daemon and libraries.
 
 %build
 unset LD_AS_NEEDED
-export LD_RUN_PATH=/usr/lib/sensord-qt5/
+export LD_RUN_PATH=%{_libdir}/sensord-qt5/
 export QT_SELECT=5
 
 %qmake5 CONFIG+=hybris %{qmake_extra_parameters} PC_VERSION=`echo %{version} | sed 's/+.*//'`

diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
@@ -93,8 +93,11 @@ API documentation for libsensord
 %setup -q -n %{name}-%{version}
 
 %build
+# setup proper lib
+sed "s=@LIB@=%{_lib}=g" sensord-qt5.pc.in > sensord-qt5.pc
+sed "s=@LIBDIR@=%{_libdir}=g" tests/tests.xml.in > tests/tests.xml
 unset LD_AS_NEEDED
-export LD_RUN_PATH=/usr/lib/sensord-qt5/
+export LD_RUN_PATH=%{_libdir}/sensord-qt5/
 export QT_SELECT=5
 
 %qmake5  \

diff --git a/sensord-qt5.pc → sensord-qt5.pc.in b/sensord-qt5.pc → sensord-qt5.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 includedir=${prefix}/include/sensord-qt5
-libdir=${prefix}/lib/
+libdir=${prefix}/@LIB@
 
 Name: Sensorfw-qt5
 Description: Sensord for Qt 5

diff --git a/sensord.prf b/sensord.prf
@@ -1,5 +1,5 @@
 
-LIBS += -L/usr/lib/ -lsensorclient-qt5 -lsensordatatypes-qt5
+LIBS += -L$$[QT_INSTALL_LIBS] -lsensorclient-qt5 -lsensordatatypes-qt5
 DEPENDPATH += /usr/include/sensord-qt5
 INCLUDEPATH += /usr/include/sensord-qt5 /usr/include/sensord-qt5/datatypes /usr/include/sensord-qt5/filters
 
diff --git a/sensorfw.pro b/sensorfw.pro
@@ -65,7 +65,7 @@ contains(CONFIG,hybris) {
     publicheaders.files += include/*.h
 
     INSTALLS += PKGCONFIGFILES QTCONFIGFILES
-    PKGCONFIGFILES.path = /usr/lib/pkgconfig
+    PKGCONFIGFILES.path = $$[QT_INSTALL_LIBS]/pkgconfig
     QTCONFIGFILES.files = sensord.prf
 
     qt-api.depends = datatypes

diff --git a/tests/tests.xml → tests/tests.xml.in b/tests/tests.xml → tests/tests.xml.in
@@ -83,8 +83,8 @@
         <step>stop sensord</step>
         <step>killall sensord</step>
         <step>rm -f /tmp/sensorTestSampleRate</step>
-        <step>mv /usr/lib/sensord/libalsadaptor.so /usr/lib/sensord/libalsadaptor.so.orig</step>
-        <step>ln -s /usr/lib/sensord/testing/libalsadaptor.so /usr/lib/sensord/libalsadaptor.so</step>
+        <step>mv @LIBDIR@/sensord/libalsadaptor.so @LIBDIR@/sensord/libalsadaptor.so.orig</step>
+        <step>ln -s @LIBDIR@/sensord/testing/libalsadaptor.so @LIBDIR@/sensord/libalsadaptor.so</step>
       </pre_steps>
 
       <case name="Sensord_Benchmark_50hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 50hz" timeout="45" subfeature="Sensor Framework">
@@ -112,8 +112,8 @@
         <!-- Clean up and restore normal behavior-->
         <step>stop sensord</step>
         <step>rm -f /tmp/sensorTestSampleRate</step>
-        <step>rm -f /usr/lib/sensord/libalsadaptor.so</step>
-        <step>mv /usr/lib/sensord/libalsadaptor.so.orig /usr/lib/sensord/libalsadaptor.so</step>
+        <step>rm -f @LIBDIR@/sensord/libalsadaptor.so</step>
+        <step>mv @LIBDIR@/sensord/libalsadaptor.so.orig @LIBDIR@/sensord/libalsadaptor.so</step>
         <step>start sensord</step>
       </post_steps>