diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/mksh/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/mksh/Makefile')
| -rw-r--r-- | package/mksh/Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/package/mksh/Makefile b/package/mksh/Makefile index b141d0693..1ef2368b0 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -6,16 +6,20 @@ include ${TOPDIR}/rules.mk PKG_NAME= mksh -PKG_VERSION= 35b -PKG_RELEASE= 2 +PKG_VERSION= 38 +PKG_RELEASE= 1 +PKG_MD5SUM= e2fa1f50690abf763cc3e4d8e1612728 +PKG_DESCR:= popular MirOS KSH +PKG_SECTION:= shells +PKG_URL:= http://www.mirbsd.org +PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} + DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.cpio.gz -PKG_MD5SUM= 0e96cd3f8141b7abc679bbb303a8be2c -MASTER_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MKSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),) TCPPFLAGS+= -DMKSH_SMALL=1 @@ -24,7 +28,7 @@ endif do-build: cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' \ CPPFLAGS='${TCPPFLAGS}' LDFLAGS='${TLDFLAGS}' \ - TARGET_OS=${UNAME_S} ${BASH} ${WRKSRC}/Build.sh -Q -r + TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r do-install: install -d -m 0755 ${IDIR_MKSH}/bin |