summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-09-15 14:15:24 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-15 17:38:21 +0100
commit224d6a41d5898eea189bf87a4faace1aa982dffe (patch)
tree190fae759e79a05a62b0a303745685b02820fa47
parentdfc9aaa3880ef1f38a5716b2c2e5128692f7acc1 (diff)
downloaddefinitions-224d6a41d5898eea189bf87a4faace1aa982dffe.tar.gz
Bison depends on help2man
Move help2man to core as bison depends on it; the attempt to create manpages without help2man turns from no-op to hard error since automake 1.13
-rw-r--r--strata/core.morph9
-rw-r--r--strata/core/help2man.morph (renamed from strata/foundation/help2man.morph)0
-rw-r--r--strata/foundation.morph6
3 files changed, 9 insertions, 6 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 13250ab6..535f9d2c 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -206,6 +206,14 @@ chunks:
- gettext
- libexpat
- openssl-new
+- name: help2man
+ morph: strata/core/help2man.morph
+ repo: upstream:help2man
+ ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
- name: bison
morph: strata/core/bison.morph
repo: upstream:bison
@@ -218,6 +226,7 @@ chunks:
- flex
- gettext
- git
+ - help2man
- mini-utils
- name: gperf
morph: strata/core/gperf.morph
diff --git a/strata/foundation/help2man.morph b/strata/core/help2man.morph
index e25a8d8e..e25a8d8e 100644
--- a/strata/foundation/help2man.morph
+++ b/strata/core/help2man.morph
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 757b25d4..2af03865 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -111,12 +111,6 @@ chunks:
build-depends:
- glib
- systemd
-- name: help2man
- morph: strata/foundation/help2man.morph
- repo: upstream:help2man
- ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
- unpetrify-ref: baserock/morph
- build-depends: []
- name: libxslt
repo: upstream:libxslt
ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e