summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-11-19 16:22:54 (GMT)
committerJavier Jardón <jjardon@gnome.org>2014-11-19 16:23:36 (GMT)
commit0f90d4a8219199f6941da600f173f96b06bc5a52 (patch)
tree28c8f7e77cd22ed314343ea15ae308fcafddd402
parentd38b006f062bdfc7aa0014e59d0e8894a35641ee (diff)
parent0e2de61790167723110aecaf5faef98da8db87b4 (diff)
downloaddefinitions-0f90d4a8219199f6941da600f173f96b06bc5a52.tar.gz
Merge branch 'baserock/jjardon/git'
Reviewed-by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r--strata/core.morph4
-rw-r--r--strata/core/git.morph7
2 files changed, 6 insertions, 5 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 140674f..0a8122f 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -205,8 +205,8 @@ chunks:
- name: git
morph: strata/core/git.morph
repo: upstream:git
- ref: 43efcf42382e87de4aa423e5e1607958ad1717d0
- unpetrify-ref: baserock/morph
+ ref: 49c3e926349e964b311b46251bb2b97d3d669855
+ unpetrify-ref: v2.1.3
build-depends:
- autoconf
- cpython
diff --git a/strata/core/git.morph b/strata/core/git.morph
index 62932b0..765f4a5 100644
--- a/strata/core/git.morph
+++ b/strata/core/git.morph
@@ -1,6 +1,7 @@
name: git
kind: chunk
+build-system: autotools
+pre-configure-commands:
+- make configure
build-commands:
-- make prefix=${PREFIX-/usr} all PYTHON_PATH=${PREFIX-/usr}/bin/python NO_TCLTK=YesPlease
-install-commands:
-- make prefix=${PREFIX-/usr} install
+- make all