SF.net SVN: geany-plugins:[857] branches/geany-plugins-0.17.1/geanygdb/src

[hyperair at users.sourceforge.net]

Revision: 857
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=857&view=rev
Author:   hyperair
Date:     2009-07-21 20:53:51 +0000 (Tue, 21 Jul 2009)

Log Message:
-----------
Move ttyhelper to $libexecdir/geany-plugins/geanygdb

Modified Paths:
--------------
    branches/geany-plugins-0.17.1/geanygdb/src/Makefile.am
    branches/geany-plugins-0.17.1/geanygdb/src/geanydebug.c

Modified: branches/geany-plugins-0.17.1/geanygdb/src/Makefile.am
===================================================================
--- branches/geany-plugins-0.17.1/geanygdb/src/Makefile.am	2009-07-21 20:45:27 UTC (rev 856)
+++ branches/geany-plugins-0.17.1/geanygdb/src/Makefile.am	2009-07-21 20:53:51 UTC (rev 857)
@@ -1,7 +1,8 @@
 include $(top_srcdir)/build/vars.build.mk
 
+geanygdbdir = $(libexecdir)/geany-plugins/geanygdb
 geanyplugins_LTLIBRARIES = geanygdb.la
-geanyplugins_PROGRAMS = ttyhelper
+geanygdb_PROGRAMS = ttyhelper
 
 geanygdb_la_SOURCES = \
 	gdb-io.h \
@@ -22,6 +23,7 @@
 	gdb-io-stack.c \
 	gdb-ui-locn.c
 
+geanygdb_la_CFLAGS = $(AM_CFLAGS) -DTTYHELPERDIR=\""$(geanygdbdir)"\"
 geanygdb_la_LIBADD = $(COMMONLIBS)
 
 ttyhelper_SOURCES = ttyhelper.c

Modified: branches/geany-plugins-0.17.1/geanygdb/src/geanydebug.c
===================================================================
--- branches/geany-plugins-0.17.1/geanygdb/src/geanydebug.c	2009-07-21 20:45:27 UTC (rev 856)
+++ branches/geany-plugins-0.17.1/geanygdb/src/geanydebug.c	2009-07-21 20:53:51 UTC (rev 857)
@@ -363,7 +363,7 @@
 	 * the tty helper binary is either in the user's config dir or globally
 	 * installed in $LIBDIR/geany/
 	 */
-	glob_file = g_build_filename(LIBDIR, "geany", "ttyhelper", NULL);
+	glob_file = g_build_filename(TTYHELPERDIR, "ttyhelper", NULL);
 	user_file = g_build_filename(geany->app->configdir, "plugins", UNIX_NAME, "ttyhelper", NULL);
 	gdbio_setup.tty_helper = NULL;
 


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