SF.net SVN: geany-plugins:[283] trunk/geanydebug/src

[eht16 at users.sourceforge.net]

Revision: 283
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=283&view=rev
Author:   eht16
Date:     2008-11-04 19:55:00 +0000 (Tue, 04 Nov 2008)

Log Message:
-----------
Rename the ttyhelper binary to 'geanydebug_ttyhelper'.
Fix the path of the ttyhelper app since it is installed in $prefix/bin.

Modified Paths:
--------------
    trunk/geanydebug/src/Makefile.am
    trunk/geanydebug/src/geanydebug.c

Modified: trunk/geanydebug/src/Makefile.am
===================================================================
--- trunk/geanydebug/src/Makefile.am	2008-11-04 19:52:21 UTC (rev 282)
+++ trunk/geanydebug/src/Makefile.am	2008-11-04 19:55:00 UTC (rev 283)
@@ -21,8 +21,8 @@
 geanydebug_la_LDFLAGS = -module -avoid-version
 geanydebug_la_LIBADD  = @GEANY_LIBS@  $(INTLLIBS)
 
-bin_PROGRAMS = ttyhelper
+bin_PROGRAMS = geanydebug_ttyhelper
 ttyhelper_SOURCES = ttyhelper.c
 
-AM_CFLAGS = @GEANY_CFLAGS@ -DLOCALEDIR=\""$(localedir)"\"
+AM_CFLAGS = @GEANY_CFLAGS@ -DLOCALEDIR=\""$(localedir)"\" -DPREFIX=\""$(prefix)"\"
 

Modified: trunk/geanydebug/src/geanydebug.c
===================================================================
--- trunk/geanydebug/src/geanydebug.c	2008-11-04 19:52:21 UTC (rev 282)
+++ trunk/geanydebug/src/geanydebug.c	2008-11-04 19:55:00 UTC (rev 283)
@@ -320,7 +320,9 @@
 	gdbui_setup.main_window = geany->main_widgets->window;
 
 	gdbio_setup.temp_dir = g_build_filename(geany->app->configdir, "plugins", unix_name, NULL);
-	gdbio_setup.tty_helper = g_build_filename(gdbio_setup.temp_dir, "ttyhelper", NULL);
+	/*gdbio_setup.tty_helper = g_build_filename(gdbio_setup.temp_dir, "geanydebug_ttyhelper", NULL);*/
+	/* the tty helper binary is installed in $prefix/bin, so use this path */
+	gdbio_setup.tty_helper = g_build_filename(PREFIX, "bin", "geanydebug_ttyhelper", NULL);
 	config_file = g_build_filename(gdbio_setup.temp_dir, "debugger.cfg", NULL);
 	gdbui_opts_init();
 	if (g_key_file_load_from_file(kf, config_file, G_KEY_FILE_NONE, NULL))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.