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/zsh/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/zsh/Makefile')
| -rw-r--r-- | package/zsh/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/package/zsh/Makefile b/package/zsh/Makefile index 7e5a66581..258841595 100644 --- a/package/zsh/Makefile +++ b/package/zsh/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= zsh PKG_VERSION:= 4.3.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 1b08c063f02d595709eaad1548c4e392 -MASTER_SITES:= ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ +PKG_DESCR:= Z Shell +PKG_SECTION:= shells +PKG_URL:= http://www.zsh.org +PKG_SITES:= ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto @@ -21,6 +24,6 @@ INSTALL_STYLE= auto post-install: $(INSTALL_DIR) $(IDIR_ZSH)/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/zsh $(IDIR_ZSH)/bin/ + $(INSTALL_BIN) $(WRKINST)/usr/bin/zsh $(IDIR_ZSH)/bin include ${TOPDIR}/mk/pkg-bottom.mk |