summaryrefslogtreecommitdiff
path: root/package/autoconf/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
commit5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch)
treecd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/autoconf/Makefile
parent401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff)
parent4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: BUGS package/autoconf/Makefile
Diffstat (limited to 'package/autoconf/Makefile')
-rw-r--r--package/autoconf/Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index e90c82f89..b7517b3b3 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -4,9 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= autoconf
+<<<<<<< HEAD
PKG_VERSION:= 2.64
PKG_RELEASE:= 2
PKG_MD5SUM:= 30a198cef839471dd4926e92ab485361
+=======
+PKG_VERSION:= 2.65
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 46cfb40e0babf4c64f8325f03da81c9b
+>>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a
PKG_DESCR:= GNU autoconf
PKG_SECTION:= utils
PKG_URL:= http://www.gnu.org/software/autoconf/
@@ -17,10 +23,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,AUTOCONF,${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_AUTOCONF}/usr/bin
${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/share/autoconf