commit 5b1ea6f9c4bfc9e22c62eb3a5e6ec1dd379d03e8
author Gerrit <chrome-bot@google.com> Sat Jul 21 02:17:32 2012
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Sat Jul 21 02:17:32 2012
tree bdda989e471e778cc25f09f0334c2d4ee8d40ae7
parent 38a61f2ba70b73ed2ce00eb1a3656fda237c2e8f
parent 89304f496deca58dd3b343ea018136020c5bf56a

Merge "timer: fix PRIi64 usage"

doc/wscript_build

diff --git a/doc/wscript_build b/doc/wscript_build
index 5bdd0ce..8b23b79 100644
--- a/doc/wscript_build
+++ b/doc/wscript_build
@@ -6,7 +6,7 @@
         APPNAME = 'GLMARK2',
         appname = 'glmark2',
         appversion = bld.env.GLMARK2_VERSION,
-        install_path = '${PREFIX}/share/man/man1'
+        install_path = '${MANDIR}/man1'
     )
 
 if bld.env.USE_GLESv2:
@@ -17,5 +17,5 @@
         APPNAME = 'GLMARK2-ES2',
         appname = 'glmark2-es2',
         appversion = bld.env.GLMARK2_VERSION,
-        install_path = '${PREFIX}/share/man/man1'
+        install_path = '${MANDIR}/man1'
     )

wscript

diff --git a/wscript b/wscript
index ed416ee..0f62e94 100644
--- a/wscript
+++ b/wscript
@@ -12,6 +12,7 @@
 APPNAME = 'glmark2'
 
 def options(opt):
+    opt.tool_options('gnu_dirs')
     opt.tool_options('compiler_cc')
     opt.tool_options('compiler_cxx')
 
@@ -28,8 +29,6 @@
                    default = True, help='disable compiler debug information')
     opt.add_option('--no-opt', action='store_false', dest = 'opt',
                    default = True, help='disable compiler optimizations')
-    opt.add_option('--data-path', action='store', dest = 'data_path',
-                   help='the path to install the data to')
     opt.add_option('--extras-path', action='store', dest = 'extras_path',
                    help='path to additional data (models, shaders, textures)')
 
@@ -39,6 +38,7 @@
         ctx.fatal("You must configure using at least one of --enable-gl, " +
                   "--enable-glesv2, --enable-gl-drm, --enable-glesv2-drm")
 
+    ctx.check_tool('gnu_dirs')
     ctx.check_tool('compiler_cc')
     ctx.check_tool('compiler_cxx')
 
@@ -84,17 +84,15 @@
     if Options.options.debug:
         ctx.env.prepend_value('CXXFLAGS', '-g')
 
-    if Options.options.data_path is None:
-        Options.options.data_path = os.path.join(ctx.env.PREFIX, 'share/glmark2')
-
     ctx.env.HAVE_EXTRAS = False
     if Options.options.extras_path is not None:
         ctx.env.HAVE_EXTRAS = True
         ctx.env.append_unique('GLMARK_EXTRAS_PATH', Options.options.extras_path)
         ctx.env.append_unique('DEFINES', 'GLMARK_EXTRAS_PATH="%s"' % Options.options.extras_path)
 
-    ctx.env.append_unique('GLMARK_DATA_PATH', Options.options.data_path)
-    ctx.env.append_unique('DEFINES', 'GLMARK_DATA_PATH="%s"' % Options.options.data_path)
+    data_path = os.path.join(ctx.env.DATADIR, 'glmark2')
+    ctx.env.append_unique('GLMARK_DATA_PATH', data_path)
+    ctx.env.append_unique('DEFINES', 'GLMARK_DATA_PATH="%s"' % data_path)
     ctx.env.append_unique('DEFINES', 'GLMARK_VERSION="%s"' % VERSION)
     ctx.env.GLMARK2_VERSION = VERSION
 
@@ -104,7 +102,7 @@
     ctx.env.USE_GLESv2_DRM = Options.options.glesv2_drm
 
     ctx.msg("Prefix", ctx.env.PREFIX, color = 'PINK')
-    ctx.msg("Data path", Options.options.data_path, color = 'PINK')
+    ctx.msg("Data path", data_path, color = 'PINK')
     ctx.msg("Including extras", "Yes" if ctx.env.HAVE_EXTRAS else "No",
             color = 'PINK');
     if ctx.env.HAVE_EXTRAS: