Author: loonycyborg
Date: Mon Oct 13 16:25:07 2008
New Revision: 30117
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30117&view=rev
Log:
Added a warning if prefix is set to relative dir and fixed interference
with destdir option in case of relative prefix.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=30117&r1=30116&r2=30117&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Mon Oct 13 16:25:07 2008
@@ -315,6 +315,9 @@
installdirs = Split("bindir datadir fifodir icondir desktopdir mandir docdir
python_site_packages_dir")
for d in installdirs:
env[d] = os.path.join(env["prefix"], env[d])
+if not os.path.isabs(env["prefix"]):
+ print "Warning: prefix is set to relative dir. destdir setting will be
ignored."
+ env["destdir"] = ""
if env["PLATFORM"] == 'win32':
env.Append(LIBS = ["wsock32", "intl", "z"], CXXFLAGS = ["-mthreads"],
LINKFLAGS = ["-mthreads"])
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
