diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
deleted file mode 100644
index 9946c73c715..00000000000
--- a/meta/recipes-devtools/automake/automake.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "A GNU tool for automatically generating Makefiles"
-DESCRIPTION = "Automake is a tool for automatically generating `Makefile.in' files compliant with the GNU Coding \
-Standards. Automake requires the use of Autoconf."
-LICENSE = "GPL-2.0-only"
-HOMEPAGE = "http://www.gnu.org/software/automake/"
-SECTION = "devel"
-
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz"
-
-inherit autotools texinfo
-
-do_configure() {
-	# We can end up patching macros, which would then mean autoreconf
-	# Cheat by saying everything is up to date.
-	touch ${S}/aclocal.m4 ${S}/Makefile.in ${S}/configure
-	oe_runconf
-}
-
-export AUTOMAKE = "${@bb.utils.which('automake', d.getVar('PATH'))}"
-
-FILES:${PN} += "${datadir}/automake* ${datadir}/aclocal*"
diff --git a/meta/recipes-devtools/automake/automake_1.19.bb b/meta/recipes-devtools/automake/automake_1.19.bb
index 0ee4d8facfa..aaf3ab9a6f5 100644
--- a/meta/recipes-devtools/automake/automake_1.19.bb
+++ b/meta/recipes-devtools/automake/automake_1.19.bb
@@ -1,10 +1,38 @@
-require automake.inc
-
+SUMMARY = "A GNU tool for automatically generating Makefiles"
+DESCRIPTION = "Automake is a tool for automatically generating `Makefile.in' files compliant with the GNU Coding \
+Standards. Automake requires the use of Autoconf."
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS:class-native = "autoconf-native"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
 
-NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}"
+DEPENDS = "autoconf-native"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz \
+           file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \
+           file://0004-Add-a-new-distro-feature-ptest.patch \
+           file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \
+           "
+
+SRC_URI[sha256sum] = "79e8b1f7a967e87ce8a9ded76bee7f793d0ce1886ab2002feb1b0510f578b75a"
+
+inherit autotools texinfo
+
+PERL = "${USRBINPATH}/perl"
+PERL:class-native = "${USRBINPATH}/env perl"
+PERL:class-nativesdk = "${USRBINPATH}/env perl"
+
+CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'"
+
+do_configure() {
+	# We can end up patching macros, which would then mean autoreconf
+	# Cheat by saying everything is up to date.
+	touch ${S}/aclocal.m4 ${S}/Makefile.in ${S}/configure
+	oe_runconf
+}
+
+FILES:${PN} += "${datadir}/automake* ${datadir}/aclocal*"
 
 RDEPENDS:${PN} += "\
     autoconf \
@@ -19,22 +47,4 @@ RDEPENDS:${PN} += "\
 
 RDEPENDS:${PN}:class-native = "autoconf-native hostperl-runtime-native"
 
-SRC_URI += "\
-           file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \
-           file://0004-Add-a-new-distro-feature-ptest.patch \
-           file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \
-           "
-
-SRC_URI[sha256sum] = "79e8b1f7a967e87ce8a9ded76bee7f793d0ce1886ab2002feb1b0510f578b75a"
-
-PERL = "${USRBINPATH}/perl"
-PERL:class-native = "${USRBINPATH}/env perl"
-PERL:class-nativesdk = "${USRBINPATH}/env perl"
-
-CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'"
-
-do_install:append () {
-    install -d ${D}${datadir}
-}
-
 BBCLASSEXTEND = "native nativesdk"