branches/kdevelop/3.4/buildtools/autotools

[Andreas Pakulat]

SVN commit 626826 by apaku:

Seems I can't read docs.

Matt: Do you want to retag the two files? The build/exectute target actions on the AM are useless without this fix.
CCMAIL:kdevelop-devel at kdevelop.org
BUG:140558


 M  +1 -1      autodetailsview.cpp  
 M  +1 -1      autoprojectpart.cpp  


--- branches/kdevelop/3.4/buildtools/autotools/autodetailsview.cpp #626825:626826
@@ -367,7 +367,7 @@
 	else
 		titem = static_cast <TargetItem*> ( m_listView->selectedItem() );
 
-	QString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_widget->selectedSubproject()->subdir;
+	QString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_widget->selectedSubproject()->relativePath();
 
 	m_part->buildTarget(relpath, titem);
 }
--- branches/kdevelop/3.4/buildtools/autotools/autoprojectpart.cpp #626825:626826
@@ -1143,7 +1143,7 @@
         kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
         program += titem->name;
     }else
-        program += buildDirectory() + "/" + URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ) + "/" + m_widget->selectedSubproject()->subdir + "/" + titem->name;
+        program += buildDirectory() + "/" + URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ) + "/" + m_widget->selectedSubproject()->relativePath()+ "/" + titem->name;
 
     QString args = DomUtil::readEntry(*projectDom(), "/kdevautoproject/run/runarguments/" + titem->name);