diff options
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 07813d61f..75211e47d 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; |