Revision: 625 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=625&view=rev Author: dmaphy Date: 2009-05-07 19:21:25 +0000 (Thu, 07 May 2009)

Log Message: ----------- install ttyhelper in $LIBDIR/geany/ (patch by Chow Loong Jin, thanks!)

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

Modified: trunk/geanygdb/src/Makefile.am =================================================================== --- trunk/geanygdb/src/Makefile.am 2009-05-04 21:24:38 UTC (rev 624) +++ trunk/geanygdb/src/Makefile.am 2009-05-07 19:21:25 UTC (rev 625) @@ -21,8 +21,11 @@ geanygdb_la_LDFLAGS = -module -avoid-version geanygdb_la_LIBADD = @GEANY_LIBS@ $(INTLLIBS)

-bin_PROGRAMS = geanygdb_ttyhelper -geanygdb_ttyhelper_SOURCES = ttyhelper.c +geanygdbdir = $(libdir)/geany/ +geanygdb_PROGRAMS = ttyhelper +ttyhelper_SOURCES = ttyhelper.c

-AM_CFLAGS = @GEANY_CFLAGS@ -DLOCALEDIR=""$(localedir)"" -DPREFIX=""$(prefix)"" -DLIBDIR=""$(libdir)""

+ +AM_CFLAGS = @GEANY_CFLAGS@ -DLOCALEDIR=""$(localedir)"" -DLIBDIR=""$(libdir)"" +

Modified: trunk/geanygdb/src/geanydebug.c =================================================================== --- trunk/geanygdb/src/geanydebug.c 2009-05-04 21:24:38 UTC (rev 624) +++ trunk/geanygdb/src/geanydebug.c 2009-05-07 19:21:25 UTC (rev 625) @@ -387,9 +387,9 @@

/* * the tty helper binary is either in the user's config dir or globally - * installed in $PREFIX/$LIBDIR/geany/ + * installed in $LIBDIR/geany/ */ - gdbio_setup.tty_helper = g_build_filename(PREFIX, LIBDIR, "geany", "ttyhelper", NULL); + gdbio_setup.tty_helper = g_build_filename(LIBDIR, "geany", "ttyhelper", NULL); if (! (g_file_test(gdbio_setup.tty_helper, G_FILE_TEST_IS_EXECUTABLE) && g_file_test(gdbio_setup.tty_helper, G_FILE_TEST_IS_REGULAR))) { @@ -397,7 +397,6 @@ geany->app->configdir, "plugins", unix_name, "ttyhelper", NULL)); }

- g_message(gdbio_setup.tty_helper); config_file = g_build_filename(gdbio_setup.temp_dir, "debugger.cfg", NULL); gdbui_opts_init();

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