cheese r521 - in trunk: . data
- From: dgsiegel svn gnome org
- To: svn-commits-list gnome org
- Subject: cheese r521 - in trunk: . data
- Date: Tue, 19 Feb 2008 15:40:07 +0000 (GMT)
Author: dgsiegel
Date: Tue Feb 19 15:40:07 2008
New Revision: 521
URL: http://svn.gnome.org/viewvc/cheese?rev=521&view=rev
Log:
make waf work again with cheese.desktop.in.in
Modified:
trunk/ChangeLog
trunk/data/wscript_build
trunk/wscript
Modified: trunk/data/wscript_build
==============================================================================
--- trunk/data/wscript_build (original)
+++ trunk/data/wscript_build Tue Feb 19 15:40:07 2008
@@ -29,7 +29,7 @@
obj = bld.create_obj('subst')
obj.source = 'cheese.desktop.in.in'
obj.target = 'cheese.desktop.in'
-obj.dict = {'VERSION': env['VERSION'], 'FULL_LIBDIR': env['PACKAGE_DATADIR']}
+obj.dict = {'VERSION': env['VERSION'], 'FULL_LIBEXECDIR': env['PACKAGE_LIBEXECDIR']}
obj.fun = misc.subst_func
obj.prio = 1 # make sure that we run before intltool_in which processes desktop.in file
Modified: trunk/wscript
==============================================================================
--- trunk/wscript (original)
+++ trunk/wscript Tue Feb 19 15:40:07 2008
@@ -69,6 +69,7 @@
conf.define('PACKAGE_DOCDIR', conf.env['DATADIR'] + '/share/doc/cheese')
conf.define('PACKAGE_LOCALEDIR', conf.env['DATADIR'] + '/locale')
+ conf.define('PACKAGE_LIBEXECDIR', conf.env['PREFIX'] + '/libexec/cheese')
conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H')
conf.write_config_header('cheese-config.h')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]