diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-18 07:43:46 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-18 07:43:46 (GMT) |
commit | a1b7adf83167a94d606c635c261b584967880d0b (patch) | |
tree | 2cdfb405c991e936c9571cc91e6d176e66781787 /scripts | |
parent | a4ccb8b6cbefc3333e160d1a48c1df2e84929e2a (diff) | |
parent | 15a4b3a51448731bf4ede644cca21daba55d5791 (diff) |
Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build
Conflicts:
Makefile
scripts/sugar.modules
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/sugar.modules | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/sugar.modules b/scripts/sugar.modules index 3b6dd68..c0f3f80 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" supports-non-srcdir-builds="no"> + <autotools id="sugar-base"> <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/> </autotools> - <autotools id="sugar-toolkit" supports-non-srcdir-builds="no"> + <autotools id="sugar-toolkit"> <branch module="sugar-toolkit/mainline.git" checkoutdir="sugar-toolkit"/> <dependencies> <dep package="sugar-datastore"/> </dependencies> </autotools> - <autotools id="sugar-toolkit-gtk3" supports-non-srcdir-builds="no"> + <autotools id="sugar-toolkit-gtk3"> <branch module="~manuq/sugar-toolkit-gtk3/manuqs-sugar-toolkit-gtk3.git" checkoutdir="sugar-toolkit-gtk3"/> <dependencies> <dep package="sugar-datastore"/> </dependencies> </autotools> - <autotools id="sugar" supports-non-srcdir-builds="no"> + <autotools id="sugar"> <branch module="~manuq/sugar/manuqs-erikos-shell-port.git" checkoutdir="sugar"/> <dependencies> <dep package="sugar-base"/> @@ -26,10 +26,10 @@ <dep package="sugar-artwork"/> </dependencies> </autotools> - <autotools id="sugar-artwork" supports-non-srcdir-builds="no"> + <autotools id="sugar-artwork"> <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/> </autotools> - <autotools id="sugar-datastore" supports-non-srcdir-builds="no"> + <autotools id="sugar-datastore"> <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/> </autotools> |