diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-06-26 14:02:26 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-06-26 14:02:26 (GMT) |
| commit | d218ce894c57818d16fe21e1fdf240489f4303b6 (patch) | |
| tree | 33ebd5772f651d9dc779148e04b229086bbffb2c /scripts | |
| parent | 30ed5839458e8039e1656b161d6964aca1d96995 (diff) | |
Build out of source directory when possible
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-activity | 2 | ||||
| -rw-r--r-- | scripts/jhbuildrc | 3 | ||||
| -rw-r--r-- | scripts/sugar.modules | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/scripts/build-activity b/scripts/build-activity index 912f1fa..c1aaaf7 100755 --- a/scripts/build-activity +++ b/scripts/build-activity @@ -4,5 +4,5 @@ scriptsdir=`dirname "$0"` rootdir=`dirname "$scriptsdir"` cd $rootdir/activities/$1 -./setup.py install --prefix=$rootdir/build +./setup.py install --prefix=$rootdir/install diff --git a/scripts/jhbuildrc b/scripts/jhbuildrc index 5ce10e1..2e4e84f 100644 --- a/scripts/jhbuildrc +++ b/scripts/jhbuildrc @@ -17,7 +17,8 @@ moduleset = [os.path.join(root(), "scripts", "system.modules"), modules = ["meta-system", "meta-sugar"] checkoutroot = os.path.join(root(), "source") -prefix = os.path.join(root(), "build") +buildroot = os.path.join(root(), "build") +prefix = os.path.join(root(), "install") os.environ["GTK_DATA_PREFIX"] = prefix os.environ["GTK_PATH"] = os.path.join(libdir(), "gtk-2.0") diff --git a/scripts/sugar.modules b/scripts/sugar.modules index 1c506eb..4b62685 100644 --- a/scripts/sugar.modules +++ b/scripts/sugar.modules @@ -3,22 +3,22 @@ <moduleset> <repository type="git" name="git.sugarlabs.org" default="yes" href="git://git.sugarlabs.org"/> - <autotools id="sugar-base"> + <autotools id="sugar-base" supports-non-srcdir-builds="no"> <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/> </autotools> - <autotools id="sugar-toolkit"> + <autotools id="sugar-toolkit" supports-non-srcdir-builds="no"> <branch module="sugar-toolkit/mainline.git" checkoutdir="sugar-toolkit"/> <dependencies> <dep package="sugar-datastore"/> </dependencies> </autotools> - <autotools id="sugar-toolkit-gtk3"> + <autotools id="sugar-toolkit-gtk3" supports-non-srcdir-builds="no"> <branch module="sugar-toolkit-gtk3/sugar-toolkit-gtk3.git" checkoutdir="sugar-toolkit-gtk3"/> <dependencies> <dep package="sugar-datastore"/> </dependencies> </autotools> - <autotools id="sugar"> + <autotools id="sugar" supports-non-srcdir-builds="no"> <branch module="sugar/mainline.git" checkoutdir="sugar"/> <dependencies> <dep package="sugar-base"/> @@ -26,10 +26,10 @@ <dep package="sugar-artwork"/> </dependencies> </autotools> - <autotools id="sugar-artwork"> + <autotools id="sugar-artwork" supports-non-srcdir-builds="no"> <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/> </autotools> - <autotools id="sugar-datastore"> + <autotools id="sugar-datastore" supports-non-srcdir-builds="no"> <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/> </autotools> |