Accomodate docs for build dir renaming

diff --git a/INSTALL b/INSTALL
index 50ae6001c4a65bda293876ce6613ba1559b5eaf7..238ba54ce9b6437475841c4100a61240386aad70 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -37,7 +37,7 @@ Midori is now built with debugging symbols.
 
 Make sure you have installed 'gdb', the GNU Debugger.
 
-Run Midori as 'gdb _build_/default/midori/midori'.
+Run Midori as 'gdb _build/default/midori/midori'.
 
 Inside gdb, type 'run'.
 
@@ -49,29 +49,29 @@ function names and line numbers.
 
 If the problem is a warning and not a crash, try this:
 
-'G_DEBUG=all gdb _build_/default/midori/midori'
+'G_DEBUG=all gdb _build/default/midori/midori'
 
 If you are interested in HTTP communication, try this:
 
-'MIDORI_SOUP_DEBUG=2 _build_/default/midori/midori'
+'MIDORI_SOUP_DEBUG=2 _build/default/midori/midori'
 
 Where '2' can be a level between 0 and 3.
 
 If you are interested in (non-) touchscreen behaviour, try this:
 
-'MIDORI_TOUCHSCREEN=1 _build_/default/midori/midori', or
+'MIDORI_TOUCHSCREEN=1 _build/default/midori/midori', or
 
-'MIDORI_TOUCHSCREEN=0 _build_/default/midori/midori'
+'MIDORI_TOUCHSCREEN=0 _build/default/midori/midori'
 
 If you want to "dry run" without WebKitGTK+ rendering, try this:
 
-'MIDORI_UNARMED=1 _build_/default/midori/midori'
+'MIDORI_UNARMED=1 _build/default/midori/midori'
 
 To disable Netscape plugins, use MOZ_PLUGIN_PATH=/.
 
 To debug extensions you can specify the path:
 
-'export MIDORI_EXTENSION_PATH=_build_/default/extensions'
+'export MIDORI_EXTENSION_PATH=_build/default/extensions'
 
 For further information a tutorial for gdb and
 reading up on how you can install debugging

diff --git a/configure b/configure
index f38dd4a473343289b3d6dfbf0c8c302536be20f2..f5e9d8fa18bf1e88e39feb73744c5ccee487062f 100755 (executable)
--- a/configure
+++ b/configure
@@ -130,7 +130,7 @@ clean:
 
 distclean:
        @$WAF distclean
-       @-rm -rf _build_
+       @-rm -rf _build
        @-rm -f Makefile
 
 check:

diff --git a/docs/api/wscript_build b/docs/api/wscript_build
index fdcecb50486c6e7fd430353666c7da5b2eae307b..df546b187a77671f7da66dc16794bdfb04fab609 100644 (file)
--- a/docs/api/wscript_build
+++ b/docs/api/wscript_build
@@ -6,18 +6,20 @@ import pproc as subprocess
 import os
 import Utils
 
+blddir = '_build' # recognized by ack
+
 for module in ('midori', 'katze'):
     try:
-        if not os.access ('_build_', os.F_OK):
-            Utils.check_dir ('_build_')
-        if not os.access ('_build_/docs', os.F_OK):
-            Utils.check_dir ('_build_/docs')
-        if not os.access ('_build_/docs/api', os.F_OK):
-            Utils.check_dir ('_build_/docs/api')
+        if not os.access (blddir, os.F_OK):
+            Utils.check_dir (blddir)
+        if not os.access (blddir + '/docs', os.F_OK):
+            Utils.check_dir (blddir + '/docs')
+        if not os.access (blddir + '/docs/api', os.F_OK):
+            Utils.check_dir (blddir + '/docs/api')
         subprocess.call (['gtkdoc-scan', '--module=' + module,
-            '--source-dir=' + module, '--output-dir=_build_/docs/api/' + module,
+            '--source-dir=' + module, '--output-dir=' + blddir + '/docs/api/' + module,
             '--rebuild-sections', '--rebuild-types'])
-        os.chdir ('_build_/docs/api/' + module)
+        os.chdir (blddir + '/docs/api/' + module)
         subprocess.call (['gtkdoc-mktmpl', '--module=' + module,
             '--output-dir=.' + module])
         subprocess.call (['gtkdoc-mkdb', '--module=' + module,

diff --git a/tests/wscript_build b/tests/wscript_build
index 11f14b8dc6a18277d4a92c7e0ebcc8bffcc60140..b1c02528e36e6d48f9c71d1a06e35ff58a56a9a8 100644 (file)
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -31,7 +31,7 @@ for test in tests:
     obj = bld.new_task_gen ('cc', 'program')
     obj.target = 'test-' + target
     obj.includes = '.. ../midori ../panels'
-    obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath ('_build_/default/extensions') + '"']
+    obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath ('_build/default/extensions') + '"']
     obj.source = source
     obj.vapi_dirs = '../midori'
     obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0 midori'

diff --git a/tools/midori-dev b/tools/midori-dev
index 2b6ce7d52e5df021c14f209e3302826170309494..95f9ebdf845f141b9ba7255aa0b1cdec29bae22d 100755 (executable)
--- a/tools/midori-dev
+++ b/tools/midori-dev
@@ -19,7 +19,7 @@ LOG=~/.midori.out
 
 #-----------------------------------------------------------------------------
 
-BIN=_build_/default/midori/midori
+BIN=_build/default/midori/midori
 BASENAME=`basename $0`
 
 ulimit -c unlimited