TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Continue FHS-like mode

Browse Source
This commit is contained in:
probonopd
2016-11-19 13:37:52 +01:00
parent 6fad088ed3
commit 05f2f03a88
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+11 -2
View File
@@ -219,7 +219,12 @@ int containsHowOften(QStringList haystack, QString needle) {
LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, const QSet<QString> &rpaths)
{
bundleLibraryDirectory= "lib"; // relative to bundle
if(fhsLikeMode == false){
bundleLibraryDirectory= "lib"; // relative to bundle
} else {
QString relativePrefix = fhsPrefix.replace(appDirPath+"/", "");
bundleLibraryDirectory = relativePrefix + "/lib/";
}
LogDebug() << "bundleLibraryDirectory:" << bundleLibraryDirectory;
LibraryInfo info;
@@ -764,7 +769,11 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
setenv("LD_LIBRARY_PATH",newPath.toUtf8().constData(),1);
}
changeIdentification("$ORIGIN/" + bundleLibraryDirectory, applicationBundle.binaryPath);
if(fhsLikeMode == false){
changeIdentification("$ORIGIN/" + bundleLibraryDirectory, applicationBundle.binaryPath);
} else {
changeIdentification("$ORIGIN/../lib/" + bundleLibraryDirectory, applicationBundle.binaryPath);
}
applicationBundle.libraryPaths = findAppLibraries(appDirPath);
LogDebug() << "applicationBundle.libraryPaths:" << applicationBundle.libraryPaths;