summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-10-12 20:50:23 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-10-12 23:55:38 +0200
commite0d2f1e04906bee328fa71bf4eb98b9ec1904c19 (patch)
treec244de36d490a2ced9b5d23930e260a937da4aba /qmake/generators/unix
parentcf770e66e5addc86fae6b6aeca08850627069a16 (diff)
downloadtqt3-e0d2f1e04906bee328fa71bf4eb98b9ec1904c19.tar.gz
tqt3-e0d2f1e04906bee328fa71bf4eb98b9ec1904c19.zip
Use the tqInstallPath* functions for all paths needed for the pkg-config file.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'qmake/generators/unix')
-rw-r--r--qmake/generators/unix/unixmake2.cpp52
1 files changed, 32 insertions, 20 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index b7ef82ec5..1678e22c5 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1546,26 +1546,38 @@ UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for
project->variables()["ALL_DEPS"].append(fname);
TQTextStream t(&ft);
- TQString prefix = pkgConfigPrefix();
- TQString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR");
- if(libDir.isEmpty())
- libDir = prefix + "/lib";
- TQString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR");
- if(includeDir.isEmpty())
- includeDir = prefix + "/include";
- TQString pluginsDir = project->first("QMAKE_PKGCONFIG_PLUGINS");
- if(pluginsDir.isEmpty())
- pluginsDir = prefix + "/plugins";
- TQString translationsDir = tqInstallPathTranslations();
- if(translationsDir.isEmpty())
- translationsDir = prefix + "/translations";
-
- t << "prefix=" << prefix << endl;
- t << "exec_prefix=${prefix}\n"
- << "libdir=" << pkgConfigFixPath(libDir) << "\n"
- << "includedir=" << pkgConfigFixPath(includeDir) << "\n"
- << "translationsdir=" << pkgConfigFixPath(translationsDir) << endl;
- t << "pluginsdir=" << pkgConfigFixPath(pluginsDir) << endl; // non-standard entry. Provides path for plugins
+ TQString prefix = pkgConfigPrefix();
+ TQString libDir = tqInstallPathLibs();
+ if (libDir.isEmpty())
+ {
+ libDir = prefix + "/lib";
+ }
+ TQString includeDir = tqInstallPathHeaders();
+ if (includeDir.isEmpty())
+ {
+ includeDir = prefix + "/include";
+ }
+ TQString pluginsDir = tqInstallPathPlugins();
+ if (pluginsDir.isEmpty())
+ {
+ pluginsDir = prefix + "/plugins";
+ }
+ TQString translationsDir = tqInstallPathTranslations();
+ if (translationsDir.isEmpty())
+ {
+ translationsDir = prefix + "/translations";
+ }
+
+ t << "prefix=" << prefix << endl
+ << "exec_prefix=${prefix}" << endl
+ << "libdir=" << pkgConfigFixPath(libDir) << endl
+ << "includedir=" << pkgConfigFixPath(includeDir) << endl
+ // non-standard entry. Provides path for plugins
+ << "pluginsdir=" << pkgConfigFixPath(pluginsDir) << endl
+ // non-standard entry. Provides path for translations
+ << "translationsdir=" << pkgConfigFixPath(translationsDir) << endl
+ << endl;
+
// non-standard entry. Provides useful info normally only
// contained in the internal .qmake.cache file
t << varGlue("CONFIG", "qt_config=", " ", "") << endl << endl;