From 0815563924773825c835a303b632cc418dda2fde Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 5 Dec 2012 21:52:49 +0100 Subject: replace all modules' build dirs while installing .pc, .la & .prl files now we may get files with several mentions of the same lib/include dirs on the same line, but that's essentially a non-issue. Task-number: QTBUG-28336 Change-Id: I8204086420b82015f62090ae0a56908ce0cccee8 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_module.prf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 1d34762484..ad8d9aab55 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -174,9 +174,13 @@ unix|win32-g++* { QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME QMAKE_PKGCONFIG_DESTDIR = pkgconfig - include_replace.match = $$[QT_INSTALL_HEADERS/get] + !isEmpty(_QMAKE_SUPER_CACHE_): \ + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$[QT_INSTALL_PREFIX/get] + include_replace.match = $$rplbase/include include_replace.replace = $$[QT_INSTALL_HEADERS/raw] - lib_replace.match = $$[QT_INSTALL_LIBS/get] + lib_replace.match = $$rplbase/lib lib_replace.replace = $$[QT_INSTALL_LIBS/raw] QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace } -- cgit v1.2.3