[anjuta] build-basic-autotools: Fix a bug in configure step due to the recent changes



commit 3a4c9067b6ef36b05d651d49a23c02af2c913392
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Thu Jun 23 22:47:56 2011 +0200

    build-basic-autotools: Fix a bug in configure step due to the recent changes

 plugins/build-basic-autotools/build.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/plugins/build-basic-autotools/build.c b/plugins/build-basic-autotools/build.c
index 176d6d0..9cc6e82 100644
--- a/plugins/build-basic-autotools/build.c
+++ b/plugins/build-basic-autotools/build.c
@@ -799,7 +799,6 @@ build_configure_after_autogen (GObject *sender,
 		filename = g_build_filename (root_path, "configure", NULL);
 		has_configure = stat (filename, &conf_stat) == 0;
 		g_free (filename);
-		g_free (root_path);
 			
 		if (has_configure)
 		{
@@ -815,9 +814,9 @@ build_configure_after_autogen (GObject *sender,
 				BuildProgram *prog;
 				gchar *quote;
 				GFile *work_file;
-
+				
 				quote = shell_quotef ("%s%s%s",
-					     	plugin->project_root_dir,
+					     	root_path,
 					       	G_DIR_SEPARATOR_S,
 					       	CHOOSE_COMMAND (plugin, CONFIGURE));
 
@@ -839,9 +838,14 @@ build_configure_after_autogen (GObject *sender,
 				build_project_configured (sender, handle, NULL, pack);
 			}
 			
+			g_free (root_path);
 			return;
 		}
-		anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell), _("Cannot configure project: Missing configure script in %s."), plugin->project_root_dir);
+		else
+		{
+			anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell), _("Cannot configure project: Missing configure script in %s."), root_path);
+			g_free (root_path);
+		}
 	}
 
 	if (pack)
@@ -863,9 +867,10 @@ build_generate_dir (BasicAutotoolsPlugin *plugin, GFile *dir, const gchar *args,
 	if (directory_has_file (plugin->project_root_dir, "autogen.sh"))
 	{
 		gchar *quote;
+		gchar *root_path = g_file_get_path (plugin->project_root_dir);
 
 		quote = shell_quotef ("%s%s%s",
-				plugin->project_root_dir,
+				root_path,
 			       	G_DIR_SEPARATOR_S,
 			       	CHOOSE_COMMAND (plugin, GENERATE));
 		prog = build_program_new_with_command (dir,
@@ -873,6 +878,7 @@ build_generate_dir (BasicAutotoolsPlugin *plugin, GFile *dir, const gchar *args,
 											   quote,
 											   args);
 		g_free (quote);
+		g_free (root_path);
 	}
 	else
 	{



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]