diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-06 15:57:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-06 15:57:50 +0200 |
| commit | faf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (patch) | |
| tree | 1652e4bf6d5d999b3e565b32d2e8c862efa7fc9b /package/autoconf | |
| parent | 7c46b5169bb606c3449cbb64f835589161f01166 (diff) | |
| parent | 9cfdb6d7a7e939427b7b6e41e1f2074eff724457 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
target/Config.in
Diffstat (limited to 'package/autoconf')
| -rw-r--r-- | package/autoconf/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile index 07f525241..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/ @@ -19,6 +25,9 @@ $(eval $(call PKG_template,AUTOCONF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ post-install: ${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin + ${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/share/autoconf ${CP} ${WRKINST}/usr/bin/auto* ${IDIR_AUTOCONF}/usr/bin + ${CP} ${WRKINST}/usr/share/autoconf/* \ + ${IDIR_AUTOCONF}/usr/share/autoconf include ${TOPDIR}/mk/pkg-bottom.mk |