Author: loonycyborg
Date: Wed Apr 30 18:09:33 2008
New Revision: 26258

URL: http://svn.gna.org/viewcvs/wesnoth?rev=26258&view=rev
Log:
Added autotools-style "datarootdir" and "datadirname" options to scons recipe.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=26258&r1=26257&r2=26258&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Wed Apr 30 18:09:33 2008
@@ -35,12 +35,14 @@
 opts.Add(PathOption('fifodir', 'directory for the wesnothd fifo socket file', 
"/var/run/wesnothd", PathOption.PathAccept))
 opts.Add(BoolOption('fribidi','Clear to disable bidirectional-language 
support', True))
 opts.Add(BoolOption('desktop_entry','Clear to disable desktop-entry', True))
-opts.Add(PathOption('desktopdir', 'sets the desktop entry directory to a 
non-default location', "share/applications", PathOption.PathAccept))
-opts.Add(PathOption('icondir', 'sets the icons directory to a non-default 
location', "share/icons", PathOption.PathAccept))
+opts.Add(PathOption('datarootdir', 'sets the root of data directories to a 
non-default location', "share", PathOption.PathAccept))
+opts.Add(PathOption('datadirname', 'sets the name of data directory', 
"wesnoth", PathOption.PathAccept))
+opts.Add(PathOption('desktopdir', 'sets the desktop entry directory to a 
non-default location', "$datarootdir/applications", PathOption.PathAccept))
+opts.Add(PathOption('icondir', 'sets the icons directory to a non-default 
location', "$datarootdir/icons", PathOption.PathAccept))
 opts.Add(BoolOption('internal_data', 'Set to put data in Mac OS X application 
fork', False))
 opts.Add(PathOption('localedir', 'sets the locale data directory to a 
non-default location', "translations", PathOption.PathAccept))
-opts.Add(PathOption('mandir', 'sets the man pages directory to a non-default 
location', "share/man", PathOption.PathAccept))
-opts.Add(PathOption('docdir', 'sets the doc directory to a non-default 
location', "share/doc/wesnoth", PathOption.PathAccept))
+opts.Add(PathOption('mandir', 'sets the man pages directory to a non-default 
location', "$datarootdir/man", PathOption.PathAccept))
+opts.Add(PathOption('docdir', 'sets the doc directory to a non-default 
location', "$datarootdir/doc/$datadirname", PathOption.PathAccept))
 opts.Add(BoolOption('lowmem', 'Set to reduce memory usage by removing extra 
functionality', False))
 opts.Add(BoolOption('nls','enable compile/install of gettext message 
catalogs',True))
 opts.Add(PathOption('prefix', 'autotools-style installation prefix', 
"/usr/local"))


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to