SF.net SVN: geany-plugins:[632] trunk/geanygdb

[dmaphy at users.sourceforge.net]

Revision: 632
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=632&view=rev
Author:   dmaphy
Date:     2009-05-09 19:56:04 +0000 (Sat, 09 May 2009)

Log Message:
-----------
install ttyhelper in $libdir/geany/ (patch by hyperair, thanks!)

Modified Paths:
--------------
    trunk/geanygdb/configure.in
    trunk/geanygdb/src/Makefile.am

Modified: trunk/geanygdb/configure.in
===================================================================
--- trunk/geanygdb/configure.in	2009-05-09 19:27:26 UTC (rev 631)
+++ trunk/geanygdb/configure.in	2009-05-09 19:56:04 UTC (rev 632)
@@ -43,9 +43,7 @@
 	AC_SUBST(install_sh)
 fi
 
-# get the plugin installed at the correct location for Geany
-# TODO find a way to NOT override --libdir command line option if given
-libdir="`$PKG_CONFIG --variable=libdir geany`/geany"
+libdir="`$PKG_CONFIG --variable=libdir geany`"
 
 dnl unittests
 PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [

Modified: trunk/geanygdb/src/Makefile.am
===================================================================
--- trunk/geanygdb/src/Makefile.am	2009-05-09 19:27:26 UTC (rev 631)
+++ trunk/geanygdb/src/Makefile.am	2009-05-09 19:56:04 UTC (rev 632)
@@ -1,5 +1,6 @@
 
-lib_LTLIBRARIES = geanygdb.la
+geanylibdir = $(libdir)/geany
+geanylib_LTLIBRARIES = geanygdb.la
 geanygdb_la_SOURCES = gdb-io-break.c \
     gdb-io-envir.c \
     gdb-io-frame.c \
@@ -21,8 +22,7 @@
 geanygdb_la_LDFLAGS = -module -avoid-version
 geanygdb_la_LIBADD  = @GEANY_LIBS@  $(INTLLIBS)
 
-geanygdbdir = $(libdir)
-geanygdb_PROGRAMS = ttyhelper
+geanylib_PROGRAMS = ttyhelper
 ttyhelper_SOURCES = ttyhelper.c
 
 


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