From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 31 Dec 2008 17:33:57 +0000 (+0000)
Subject: Add m4 1.4.12 but leave 1.4.9 as its GPLv2
X-Git-Tag: yocto-4.0~47388
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ce2175cbada1d75ce7e57a8cdbcabe4cda96b25;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

Add m4 1.4.12 but leave 1.4.9 as its GPLv2
---

diff --git a/meta/packages/m4/m4-native_1.4.9.bb b/meta/packages/m4/m4-native_1.4.12.bb
similarity index 100%
rename from meta/packages/m4/m4-native_1.4.9.bb
rename to meta/packages/m4/m4-native_1.4.12.bb
diff --git a/meta/packages/m4/m4_1.4.12.bb b/meta/packages/m4/m4_1.4.12.bb
new file mode 100644
index 00000000000..e2676269c18
--- /dev/null
+++ b/meta/packages/m4/m4_1.4.12.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
+processor."
+LICENSE = "GPLv3"
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
+S = "${WORKDIR}/m4-${PV}"
+
+inherit autotools
+
+EXTRA_OEMAKE += "'infodir=${infodir}'"
+
+do_configure() {
+	oe_runconf
+}
diff --git a/meta/packages/m4/m4_1.4.9.bb b/meta/packages/m4/m4_1.4.9.bb
index 77d8e822b0f..0f316757446 100644
--- a/meta/packages/m4/m4_1.4.9.bb
+++ b/meta/packages/m4/m4_1.4.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
 processor."
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
 S = "${WORKDIR}/m4-${PV}"