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/ruby | |
| 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/ruby')
| -rw-r--r-- | package/ruby/Makefile | 10 | ||||
| -rw-r--r-- | package/ruby/ipkg/ruby.control | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/package/ruby/Makefile b/package/ruby/Makefile index b9ccceb8f..76d35b1ee 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= ruby PKG_VERSION:= 1.9.1-p129 PKG_RELEASE:= 1 PKG_MD5SUM:= c71f413514ee6341c627be2957023a5c -MASTER_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/1.9/ +PKG_DESCR:= interpreter for the ruby language +PKG_SECTION:= net +PKG_URL:= http://www.ruby-lang.org +PKG_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/1.9/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) MAKE_FILE:= GNUmakefile XAKE_FLAGS+= optflags='' debugflags='' @@ -30,8 +33,9 @@ post-configure: echo "socket" >> ${WRKBUILD}/ext/Setup post-install: + ${INSTALL_DIR} ${IDIR_RUBY}/usr rm -rf ${WRKINST}/usr/lib/site_ruby find ${WRKINST}/usr -name "*.h" -delete - cp -a ${WRKINST}/usr ${IDIR_RUBY} + ${CP} ${WRKINST}/usr ${IDIR_RUBY}/usr include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ruby/ipkg/ruby.control b/package/ruby/ipkg/ruby.control deleted file mode 100644 index 090143e3d..000000000 --- a/package/ruby/ipkg/ruby.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ruby -Priority: optional -Section: admin -Description: Ruby1.8 is the interpreter for the ruby language. |