From 224d6a41d5898eea189bf87a4faace1aa982dffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 14:15:24 +0100 Subject: 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 --- strata/core.morph | 9 +++++++++ strata/core/help2man.morph | 9 +++++++++ strata/foundation.morph | 6 ------ strata/foundation/help2man.morph | 9 --------- 4 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 strata/core/help2man.morph delete mode 100644 strata/foundation/help2man.morph 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/core/help2man.morph b/strata/core/help2man.morph new file mode 100644 index 00000000..e25a8d8e --- /dev/null +++ b/strata/core/help2man.morph @@ -0,0 +1,9 @@ +name: help2man +kind: chunk +configure-commands: +- autoreconf -i +- ./configure --prefix=/usr +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install 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 diff --git a/strata/foundation/help2man.morph b/strata/foundation/help2man.morph deleted file mode 100644 index e25a8d8e..00000000 --- a/strata/foundation/help2man.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: help2man -kind: chunk -configure-commands: -- autoreconf -i -- ./configure --prefix=/usr -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1