Use MDATADIR, import os and don't use waf_config_files

diff --git a/docs/api/wscript_build b/docs/api/wscript_build
index ddbcfc590e181fe674f7b05f24746a2102a195d6..70165263c9b9159f3faf5a53dbeba3ffcc32c6f5 100644 (file)
--- a/docs/api/wscript_build
+++ b/docs/api/wscript_build
@@ -3,6 +3,7 @@
 # This file is licensed under the terms of the expat license, see the file EXPAT.
 
 import pproc as subprocess
+import os
 
 for module in ('midori', 'katze'):
     try:

diff --git a/extensions/wscript_build b/extensions/wscript_build
index 2efe559d06f0196cd4fb0eaaaf15099d1f0ade6b..2196fb2d4a902f6be8b0cf760b1d5b23f19fb82b 100644 (file)
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -2,6 +2,8 @@
 # WAF build script for midori
 # This file is licensed under the terms of the expat license, see the file EXPAT.
 
+import os
+
 extensions = os.listdir ('extensions')
 for extension in extensions:
     # Tab Panel isn't useful at this point

diff --git a/icons/wscript_build b/icons/wscript_build
index 522fe647c77089b40ed17b2440d6a89fb8eaef71..6129924624e3dfe70a36684e93519918324ae5bc 100644 (file)
--- a/icons/wscript_build
+++ b/icons/wscript_build
@@ -3,6 +3,7 @@
 # This file is licensed under the terms of the expat license, see the file EXPAT.
 
 import Utils
+import os
 
 def add_image (bld, category, name):
 

diff --git a/tests/wscript_build b/tests/wscript_build
index 2de915cbe63fe215272fda7e556b7ef16e9c137e..6d315f1442da895bfb821b0d72513b58ab30c999 100644 (file)
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -2,6 +2,8 @@
 # WAF build script for midori
 # This file is licensed under the terms of the expat license, see the file EXPAT.
 
+import os
+
 tests = os.listdir ('tests')
 for test in tests:
     folder = 'tests' + os.sep + test

diff --git a/wscript b/wscript
index f7ccdfa81de1f142508d97fbbac2613e4006c79e..3a2f4f43c99d04832e1c6b79efe33702c3613115 100644 (file)
--- a/wscript
+++ b/wscript
@@ -339,8 +339,8 @@ def build (bld):
         bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*')
 
     if bld.env['HAVE_HILDON']:
-        appdir = '${DATADIR}/applications/hildon'
-        bld.install_files ('${DATADIR}/dbus-1/services',
+        appdir = '${MDATADIR}/applications/hildon'
+        bld.install_files ('${MDATADIR}/dbus-1/services',
                            'data/com.nokia.' + APPNAME + '.service')
     else:
         appdir = '${MDATADIR}/applications'
@@ -351,7 +351,7 @@ def build (bld):
         obj.flags  = '-d'
         bld.install_files (appdir, 'data/' + APPNAME + '.desktop')
     else:
-        folder = os.path.dirname (bld.env['waf_config_files'][0]) + '/data'
+        folder = os.path.abspath (blddir + '/default/data')
         Utils.check_dir (folder)
         desktop = APPNAME + '.desktop'
         pre = open ('data/' + desktop + '.in')
@@ -437,7 +437,7 @@ def shutdown ():
             Utils.pprint ('RED', "Make sure intltool is installed.")
         os.chdir ('..')
     elif Options.options.run:
-        folder = os.path.dirname (Build.bld.env['waf_config_files'][0])
+        folder = os.path.abspath (blddir + '/default')
         try:
             relfolder = folder
             if not is_mingw (Build.bld.env):