4 files changed, 30 insertions, 14 deletions
diff --git a/package/automake/Config.in b/package/automake/Config.in
deleted file mode 100644
index 9ded7338f..000000000
--- a/package/automake/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_AUTOMAKE
-	prompt "automake.......................... Automake"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/automake/
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 3c999c5cf..645d44f3f 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -4,12 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		automake
-PKG_VERSION:=		1.9.6
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		c60f77a42f103606981d456f1615f5b4
+PKG_VERSION:=		1.10
+PKG_RELEASE:=		3
+PKG_MD5SUM:=		452163c32d061c53a7acc0e8c1b689ba
 PKG_DESCR:=		GNU automake
 PKG_SECTION:=		utils
-PKG_URL:=		http://www.gnu.org/software/${PKG_NAME}/
+PKG_DEPENDS:=		microperl
+PKG_URL:=		http://www.gnu.org/software/automake/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 PKG_OPTS:=		noscripts
 
@@ -17,13 +18,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AUTOMAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin
+	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_VERSION}/
+	${CP} ${WRKINST}/usr/share/automake-${PKG_VERSION}/Automake \
+		${IDIR_AUTOMAKE}/usr/share/automake-${PKG_VERSION}/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/automake/patches/patch-Makefile_am b/package/automake/patches/patch-Makefile_am
new file mode 100644
index 000000000..e98c6ca49
--- /dev/null
+++ b/package/automake/patches/patch-Makefile_am
@@ -0,0 +1,11 @@
+--- automake-1.10.orig/Makefile.am	2006-08-22 12:01:20.000000000 +0200
++++ automake-1.10/Makefile.am	2010-02-23 19:48:10.927027207 +0100
+@@ -24,7 +24,7 @@
+ ## automake (run in doc, tests, and in the rebuild rules.)
+ ## `.' goes before doc and tests, because the latter two directories
+ ## run aclocal and automake.
+-SUBDIRS = lib . doc m4 tests
++SUBDIRS = lib . m4
+ 
+ bin_SCRIPTS = automake aclocal
+ 
diff --git a/package/automake/patches/patch-Makefile_in b/package/automake/patches/patch-Makefile_in
new file mode 100644
index 000000000..68c45e168
--- /dev/null
+++ b/package/automake/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- automake-1.10.orig/Makefile.in	2006-10-15 19:25:23.000000000 +0200
++++ automake-1.10/Makefile.in	2010-02-23 19:50:59.178535678 +0100
+@@ -162,7 +162,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lib . doc m4 tests
++SUBDIRS = lib . m4
+ bin_SCRIPTS = automake aclocal
+ CLEANFILES = $(bin_SCRIPTS)
+ AUTOMAKESOURCES = automake.in aclocal.in