Author: esr
Date: Tue Mar 25 05:30:17 2008
New Revision: 25095
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25095&view=rev
Log:
scons installation works, but with one odd error message.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25095&r1=25094&r2=25095&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Tue Mar 25 05:30:17 2008
@@ -137,6 +137,8 @@
//! DO NOT MODIFY THIS FILE !!!
//! modify SConstruct otherwise the settings will be overwritten.
+#define WESNOTH_PATH "%(datadir)s"
+
// We are building with scons, so Python cannot be absent.
#define HAVE_PYTHON
@@ -205,6 +207,10 @@
if env['prefsdir']:
env["CXXFLAGS"].append("-DPREFERENCES_DIR='\"%s\"'" % env['prefsdir'])
+
+# Simulate autools-like behavior of prefix and datadir
+if not env["datadir"].startswith("/"):
+ env["datadir"] = os.path.join(env["prefix"], env["datadir"])
cc_version = env["CCVERSION"]
if env["CC"] == "gcc":
@@ -640,10 +646,6 @@
# Installation productions
#
-# Simulate autools-like behavior of prefix and datadir
-if not env["datadir"].startswith("/"):
- env["datadir"] = os.path.join(env["prefix"], env["datadir"])
-
bindir = env['prefix'] + "/bin"
pythonlib = env['prefix'] + "/lib/python/site-packages/wesnoth"
datadir = env['datadir']
@@ -660,7 +662,7 @@
datasubs = []
for subdir in Split('data fonts icons images sounds'):
datasubs.append(env.Install(datadir, subdir))
-env.Alias('install', [bindir, pythonlib])
+env.Alias('install', [bindir, pythonlib] + datasubs)
#
# Known problems:
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
