Use the tqInstallPath* functions for all paths needed for the pkg-config file.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e0d2f1e049)
r14.0.x r14.0.11
Slávek Banko 3 years ago
parent 4ac1b8fae5
commit bfa856f8a9
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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;

Loading…
Cancel
Save