m4: Drop 1.4.9 version, convert to autotools_stage

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/m4/m4-native_1.4.12.bb b/meta/packages/m4/m4-native_1.4.12.bb
index 64442292e001a95403c8522e57d5ef722f5ccb0f..fa871b38ae1f79cb9f73fcbc34faf90375de8323 100644 (file)
--- 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 39b790339e6c23a4ef2d60339bc3db0093efaba1..8bf64cf7d4590b75ab8294b2fa9c4cda2f36684d 100644 (file)
--- 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 (file)
index 8110bcc..0000000
--- 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
-}