[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdevelop/parts/autoproject
From:       Amilcar do Carmo Lucas <amilcar () ida ! ing ! tu-bs ! de>
Date:       2003-06-04 12:52:06
[Download RAW message or body]

CVS commit by aclu: 

Fix for when projectDir != buildDir
Fix a "." that sould be a " " (SUBDIRS in makefiles are space separated and not dot \
separated)


  M +5 -3      autosubprojectview.cpp   1.8


--- kdevelop/parts/autoproject/autosubprojectview.cpp  #1.7:1.8
@@ -289,6 +289,6 @@ void AutoSubprojectView::slotRemoveSubpr
     
     // check for config.status
-    if( !QFileInfo(m_part->projectDirectory(), "config.status").exists() ){
-        KMessageBox::sorry(this, i18n("There is no config.status in the project root \
directory. Run 'Configure' first")); +    if( !QFileInfo(m_part->buildDirectory(), \
"config.status").exists() ){ +        KMessageBox::sorry(this, i18n("There is no \
config.status in the project root build directory. Run 'Configure' first"));  return;
     }
@@ -307,5 +307,5 @@ void AutoSubprojectView::slotRemoveSubpr
         
         list.remove( it );
-        parent->variables[ "SUBDIRS" ] = list.join( "." );
+        parent->variables[ "SUBDIRS" ] = list.join( " " );
         
         parent->listView()->setSelected( parent, true );
@@ -339,4 +339,6 @@ void AutoSubprojectView::slotRemoveSubpr
         cmdline += " && automake ";
         cmdline += relmakefile;
+        cmdline += " && cd ";
+        cmdline += m_part->buildDirectory();
         cmdline += " && CONFIG_HEADERS=config.h CONFIG_FILES=";
         cmdline += relmakefile;


[prev in list] [next in list] [prev in thread] [next in thread]