SF.net SVN: geany-plugins:[133] trunk/wscript
eht16 at users.sourceforge.net
eht16 at xxxxx
Tue Jul 22 13:53:08 UTC 2008
Revision: 133
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=133&view=rev
Author: eht16
Date: 2008-07-22 13:53:07 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Prefer Geany's libdir over a possibly given prefix argument when installing plugin binaries.
Modified Paths:
--------------
trunk/wscript
Modified: trunk/wscript
===================================================================
--- trunk/wscript 2008-07-21 20:52:21 UTC (rev 132)
+++ trunk/wscript 2008-07-22 13:53:07 UTC (rev 133)
@@ -159,6 +159,8 @@
enabled_plugins.remove(p.name)
conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib')
+ # get and define Geany's libdir for use as plugin binary installation dir
+ conf.define('GEANY_LIBDIR', conf.pkgconfig_fetch_variable('geany', 'libdir'), 1)
svn_rev = conf_get_svn_rev()
conf.define('ENABLE_NLS', 1)
@@ -235,7 +237,7 @@
obj.env['shlib_PATTERN'] = '%s.so'
obj.target = p.name
obj.uselib = libs
- obj.inst_var = 'LIBDIR'
+ obj.inst_var = 'GEANY_LIBDIR'
obj.inst_dir = '/geany/'
# if we are compiling more than one plugin, allow some of to fail
#~ Runner.Parallel.error_handler = error_handler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Plugins-Commits
mailing list