[libcommhistory] Use macros, not hardcoded paths. JB#50027

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
sailfishos · May 29, 2020 · fa943bd · fa943bd
1 parent 8c2791a
commit fa943bd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/common-installs-config.pri b/common-installs-config.pri
@@ -27,7 +27,7 @@
 #-----------------------------------------------------------------------------
 # setup the installation prefix
 #-----------------------------------------------------------------------------
-INSTALL_PREFIX = /usr  # default installation prefix
+INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] # default installation prefix
 
 # default prefix can be overriden by defining PREFIX when running qmake
 isEmpty( PREFIX ) {
@@ -56,7 +56,7 @@ contains( TEMPLATE, app ) {
 #-----------------------------------------------------------------------------
 contains( TEMPLATE, lib ) {
 
-    target.path  = $${INSTALL_PREFIX}/lib
+    target.path  = $$[QT_INSTALL_LIBS]
     INSTALLS    += target
     message("====")
     message("==== INSTALLS += target")

diff --git a/common-vars.pri b/common-vars.pri
@@ -38,6 +38,12 @@ isEmpty(PROJECT_VERSION) {
     message("PROJECT_VERSION is unset, assuming $$PROJECT_VERSION")
 }
 
+# This should be passed on qmake command line
+isEmpty(PKGCONFIG_LIB) {
+    PKGCONFIG_LIB = lib
+    message("PKGCONFIG_LIB is unset, assuming $$PKGCONFIG_LIB")
+}
+
 #------------------------------------------------------------------------------
 # Library version
 #------------------------------------------------------------------------------

diff --git a/rpm/libcommhistory-qt5.spec b/rpm/libcommhistory-qt5.spec
@@ -2,7 +2,6 @@ Name:       libcommhistory-qt5
 Summary:    Communications event history database API
 Version:    1.9.44
 Release:    1
-Group:      System/Libraries
 License:    LGPLv2
 URL:        https://git.sailfishos.org/mer-core/libcommhistory
 Source0:    %{name}-%{version}.tar.bz2
@@ -69,7 +68,7 @@ Documentation for libcommhistory
 
 %build
 unset LD_AS_NEEDED
-%qtc_qmake5 "PROJECT_VERSION=$(sed 's/+.*//' <<<"%{version}")"
+%qtc_qmake5 "PROJECT_VERSION=$(sed 's/+.*//' <<<"%{version}")" "PKGCONFIG_LIB=%{_lib}"
 %qtc_make %{?_smp_mflags}
 
 %install

diff --git a/src/commhistory-qt5.pc.in b/src/commhistory-qt5.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib/
+libdir=${prefix}/$$PKGCONFIG_LIB/
 includedir=${prefix}/include/commhistory-qt5/
 
 Name: libcommhistory-qt5

diff --git a/src/src.pro b/src/src.pro
@@ -91,7 +91,7 @@ headers.files = $$HEADERS \
 # -----------------------------------------------------------------------------
 QMAKE_SUBSTITUTES += $${TARGET}.pc.in
 pkgconfig.files = $${TARGET}.pc
-pkgconfig.path  = $${INSTALL_PREFIX}/lib/pkgconfig
+pkgconfig.path  = $$[QT_INSTALL_LIBS]/pkgconfig
 INSTALLS       += pkgconfig
 
 # -----------------------------------------------------------------------------