Build mesa-demos using --with-glut

1 files changed, 3 insertions, 1 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 16826ba..55d1576 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -293,7 +293,7 @@ def BuilderList(slaves):
 
       # prefix: the location on the buildslave where we stash the results of other builders
       # XXX: this is very wrong, as it means a builder is not self contained
-      prefix = '%(prop:workdir)s/../install/'
+      prefix = '%(prop:workdir)s/../install'
 
       # construct env for build steps (maybe this should be sourced from a file or script?)
       # XXX: need to run test on buildslave to determine if ccache is available, and if so, use it
@@ -324,12 +324,14 @@ def BuilderList(slaves):
       autogenargs = {
                       'xserver'          : '--enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xfake --disable-xfbdev --enable-xorg --enable-xwin --enable-xf86bigfont --enable-debug',
                       'mesa-mesa'        : '--disable-xa --with-gallium-drivers=swrast --disable-dri3 --disable-egl --enable-osmesa --enable-shared --disable-static --enable-driglx-direct',
+                      'mesa-demos'       : '--with-glut='+prefix,
                       'xf86-video-dummy' : '--disable-dga', # config check needs fixing to default to auto, not yes
                       'xts'              : '--disable-shared'
                     }
 
       if name in autogenargs:
          extra = autogenargs[name].split()
+         extra = map(Interpolate, extra)
          confcmd.extend(extra)
 
       # fontrootdir doesn't default to $prefix/share/fonts/ (bug?), so set it explicitly for font pacakages