SF.net SVN: geany-plugins:[865] trunk/geany-plugins/wscript

[eht16 at users.sourceforge.net]

Revision: 865
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=865&view=rev
Author:   eht16
Date:     2009-07-23 20:50:21 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
Add --libexecdir option to specify a libexecdir.
Add TTYHELPERDIR and LIBEXECDIR defines to the Waf build system to fix build.

Modified Paths:
--------------
    trunk/geany-plugins/wscript

Modified: trunk/geany-plugins/wscript
===================================================================
--- trunk/geany-plugins/wscript	2009-07-22 11:57:52 UTC (rev 864)
+++ trunk/geany-plugins/wscript	2009-07-23 20:50:21 UTC (rev 865)
@@ -201,7 +201,13 @@
 
 	if not is_win32:
 		set_lib_dir()
+		# libexec (e.g. for geanygdb)
+		if Options.options.libexecdir:
+			conf.define('LIBEXECDIR', Options.options.libexecdir, 1)
+		else:
+			conf.define('LIBEXECDIR', conf.env['PREFIX'] + '/libexec', 1)
 
+
 	conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK',
 		mandatory=True, args='--cflags --libs')
 	conf.check_cfg(package='geany', atleast_version='0.17', mandatory=True, args='--cflags --libs')
@@ -243,6 +249,8 @@
 						if l[2]:
 							enabled_plugins.remove(p.name)
 
+	if 'geanygdb' in enabled_plugins:
+		conf.define('TTYHELPERDIR', conf.env['LIBEXECDIR'] + '/geany-plugins/geanygdb', 1)
 
 	# Windows specials
 	if is_win32:
@@ -271,6 +279,7 @@
 	if is_win32:
 		conf.define('PREFIX', '', 1)
 		conf.define('LIBDIR', '', 1)
+		conf.define('LIBEXECDIR', '', 1)
 		conf.define('DOCDIR', 'doc', 1)
 		conf.define('LOCALEDIR', 'share/locale', 1)
 		# DATADIR is defined in objidl.h, so we remove it from config.h
@@ -317,6 +326,8 @@
 	# Paths
 	opt.add_option('--libdir', type='string', default='',
 		help='object code libraries', dest='libdir')
+	opt.add_option('--libexecdir', type='string', default='',
+		help='program executables', dest='libexecdir')
 	# Actions
 	opt.add_option('--update-po', action='store_true', default=False,
 		help='update the message catalogs for translation', dest='update_po')
@@ -370,7 +381,7 @@
 			includes	= p.includes,
 			target		= 'ttyhelper',
 			uselib		= libs,
-			install_path = '${LIBDIR}/geany'
+			install_path = '${TTYHELPERDIR}'
 		)
 
 	def install_docs(bld, pname, files):


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