From 5b2610af779ecc612a6d6a608dd7be36585ce5e6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 5 Nov 2009 18:30:24 +0000 Subject: m4: Drop 1.4.9 version, convert to autotools_stage Signed-off-by: Richard Purdie --- meta/packages/m4/m4-native_1.4.12.bb | 4 ---- meta/packages/m4/m4_1.4.12.bb | 4 +++- meta/packages/m4/m4_1.4.9.bb | 11 ----------- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 meta/packages/m4/m4_1.4.9.bb diff --git a/meta/packages/m4/m4-native_1.4.12.bb b/meta/packages/m4/m4-native_1.4.12.bb index 64442292e..fa871b38a 100644 --- a/meta/packages/m4/m4-native_1.4.12.bb +++ b/meta/packages/m4/m4-native_1.4.12.bb @@ -10,7 +10,3 @@ do_configure() { oe_runconf } -do_stage() { - install -m 0755 src/m4 ${STAGING_BINDIR}/ -} - diff --git a/meta/packages/m4/m4_1.4.12.bb b/meta/packages/m4/m4_1.4.12.bb index 39b790339..8bf64cf7d 100644 --- a/meta/packages/m4/m4_1.4.12.bb +++ b/meta/packages/m4/m4_1.4.12.bb @@ -4,7 +4,9 @@ SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ file://ac_config_links.patch;patch=1" PR = "r2" -inherit autotools +PR = "r1" + +inherit autotools_stage EXTRA_OEMAKE += "'infodir=${infodir}'" diff --git a/meta/packages/m4/m4_1.4.9.bb b/meta/packages/m4/m4_1.4.9.bb deleted file mode 100644 index 8110bcc63..000000000 --- a/meta/packages/m4/m4_1.4.9.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor." -LICENSE = "GPLv2" -SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" - -inherit autotools - -EXTRA_OEMAKE += "'infodir=${infodir}'" - -do_configure() { - oe_runconf -} -- cgit v1.2.3