[gtk-osx] Bug 739998 - berkeleydb build fails

[John Ralls <jralls src gnome org>]

commit 99d182f7725e9454a405d7ebba32de168d0f4b8c
Author: John Ralls <jralls ceridwen us>
Date:   Wed Nov 19 07:44:56 2014 -0800

    Bug 739998 - berkeleydb build fails
    
    Because nice eats the cd. Feed a leading ; to nice.

 modulesets-stable/gtk-osx-python.modules   |    3 ++-
 modulesets-unstable/gtk-osx-python.modules |    6 ++++--
 modulesets/gtk-osx-python.modules          |    3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index dfa2d02..d830208 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -41,9 +41,10 @@
     </dependencies>
   </metamodule>
 
+<!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
   <autotools id="berkeleydb" autogen-sh="configure"
             supports-non-srcdir-builds="no"  makeargs="-C build_unix"
-            autogen-template="cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s"
+            autogen-template=";cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s"
             makeinstallargs="-C build_unix install">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 09c7e34..be0628d 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -31,8 +31,9 @@
     </dependencies>
   </metamodule>
 
+<!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
    <autotools id="berkeleydb4.8" autogen-sh="dist/configure"
-         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
          makeinstallargs="-C build_unix install"
         supports-non-srcdir-builds="no">
 
@@ -54,8 +55,9 @@
     </after>
   </autotools>
 
+<!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
    <autotools id="berkeleydb5.0" autogen-sh="dist/configure"
-         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
          makeinstallargs="-C build_unix install"
         supports-non-srcdir-builds="no">
 
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 6f66aa4..028b01e 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -35,8 +35,9 @@
     </dependencies>
   </metamodule>
 
+<!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
   <autotools id="berkeleydb" autogen-sh="dist/configure"
-         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         autogen-template=";cd .;cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
          makeinstallargs="-C build_unix install">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"