Prevent to set build directories as RPATH

It result in unwanted RPATH reference from installed binaries.

Signed-off-by: OBATA Akio <obache@wizdas.com>

qmake/generators/unix/unixmake.cpp

@@ -352,11 +352,9 @@ UnixMakefileGenerator::init()
 			    comp_flags += " -version-info " + TQString::number(10*maj + min) +
 					  ":" + TQString::number(pat) + ":0";
 			    if(libtoolify[i] != "QMAKE_AR_CMD") {
-				TQString rpath = Option::output_dir;
-				if(!project->isEmpty("DESTDIR")) {
-				    rpath = project->first("DESTDIR");
-				    if(TQDir::isRelativePath(rpath))
-					rpath.prepend(Option::output_dir + Option::dir_sep);
+				TQString rpath = project->first("target.path");
+				if(rpath.right(1) != Option::dir_sep) {
+				    rpath += Option::dir_sep;
 				}
 				comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, FALSE);
 			    }

qmake/generators/unix/unixmake2.cpp

@@ -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) {