|
|
|
@ -1386,20 +1386,6 @@ void UnixMakefileGenerator::init2()
|
|
|
|
|
if(!project->isActiveConfig("compile_libtool"))
|
|
|
|
|
project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SONAME"];
|
|
|
|
|
}
|
|
|
|
|
TQString destdir = project->first("DESTDIR");
|
|
|
|
|
if ( !destdir.isEmpty() && !project->variables()["QMAKE_RPATH"].isEmpty() ) {
|
|
|
|
|
TQString rpath_destdir = destdir;
|
|
|
|
|
if(TQDir::isRelativePath(rpath_destdir)) {
|
|
|
|
|
TQFileInfo fi(Option::fixPathToLocalOS(rpath_destdir));
|
|
|
|
|
if(fi.convertToAbs()) //strange, shouldn't really happen
|
|
|
|
|
rpath_destdir = Option::fixPathToTargetOS(rpath_destdir, FALSE);
|
|
|
|
|
else
|
|
|
|
|
rpath_destdir = fi.filePath();
|
|
|
|
|
} else {
|
|
|
|
|
rpath_destdir = Option::fixPathToTargetOS(rpath_destdir, FALSE);
|
|
|
|
|
}
|
|
|
|
|
project->variables()["QMAKE_LFLAGS"] += project->first("QMAKE_RPATH") + rpath_destdir;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
TQStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
|
|
|
|
|
for(TQStringList::Iterator it = quc.begin(); it != quc.end(); ++it) {
|
|
|
|
|