X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Felinks%2FMakefile;h=765326d3e743dc03e2d4e00a4385612508da3540;hb=f907dabbe7e3103f57a27d89618bf3bba949776c;hp=98f9890466ed7cee14c49f0bf5455d96757a28f2;hpb=d45ec66efaa0c00c1d8caa92fe87dfba4cadd686;p=packages.git

diff --git a/net/elinks/Makefile b/net/elinks/Makefile
index 98f989046..765326d3e 100644
--- a/net/elinks/Makefile
+++ b/net/elinks/Makefile
@@ -1,65 +1,86 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=elinks
-PKG_VERSION:=0.11.1
-PKG_RELEASE:=2
-PKG_MD5SUM:=c09d726075e4b5810fa07f8654088755
+PKG_VERSION:=0.11.4
+PKG_RELEASE:=1
+PKG_MD5SUM:=88036a518ebc4f1150a7e14b29f9d8db
 
 PKG_SOURCE_URL:=http://elinks.or.cz/download/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/elinks
+  SUBMENU:=Web
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libopenssl
   TITLE:=A text based web browser
-  DESCRIPTION:=An advanced text based web browser
   URL:=http://elinks.or.cz/
 endef
 
-define Build/Configure
-$(call Build/Configure/Default,--enable-small\
-			--enable-256-colors\
-			--disable-backtrace\
-			--disable-data\
-			--disable-formhist\
-			--disable-leds \
-			--disable-mailcap\
-			--disable-mouse \
-			--disable-smb \
-			--disable-uri-rewrite\
-			--disable-xbel \
-  			--without-bzlib \
-                       	--without-gpm \
-			--without-idn \
-			--without-gnutls \
-			--without-libiconv \
-			--without-lua \
-			--with-openssl="$(STAGING_DIR)/usr" \
-			--without-spidermonkey\
-			--without-x\
-			--without-zlib \
-			--disable-ipv6 \, x=`echo ac_cv_file_./features.conf | tr [:blank:]-/. _` && export $$$${x}=yes && \
-			x=`echo ac_cv_file_$(PKG_BUILD_DIR)/features.conf | tr [:blank:]-/. _` && export $$$${x}=yes && \
-)
+define Package/elinks/description
+An advanced text based web browser
 endef
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR)\
-		CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld
+define Build/Configure
+ (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+                x=`echo ac_cv_file_./features.conf | tr [:blank:]-/. _` && export $$$${x}=yes && \
+                x=`echo ac_cv_file_$(PKG_BUILD_DIR)/features.conf | tr [:blank:]-/. _` && export $$$${x}=yes && \
+                $(TARGET_CONFIGURE_OPTS) \
+                CFLAGS="$(TARGET_CFLAGS)" \
+                CPPFLAGS="$(TARGET_CPPFLAGS)" \
+                LDFLAGS="$(TARGET_LDFLAGS)" \
+                ./configure \
+                        --target=$(GNU_TARGET_NAME) \
+                        --host=$(GNU_TARGET_NAME) \
+                        --build=$(GNU_HOST_NAME) \
+                        --program-prefix="" \
+                        --program-suffix="" \
+                        --prefix=/usr \
+                        --exec-prefix=/usr \
+                        --bindir=/usr/bin \
+                        --datadir=/usr/share \
+                        --includedir=/usr/include \
+                        --infodir=/usr/share/info \
+                        --libdir=/usr/lib \
+                        --libexecdir=/usr/lib \
+                        --localstatedir=/var \
+                        --mandir=/usr/share/man \
+                        --sbindir=/usr/sbin \
+                        --sysconfdir=/etc \
+                        $(DISABLE_LARGEFILE) \
+                        $(DISABLE_NLS) \
+                        --enable-small\
+                        --enable-256-colors\
+                        --disable-backtrace\
+                        --disable-data\
+                        --disable-formhist\
+                        --disable-leds \
+                        --disable-mailcap\
+                        --disable-mouse \
+                        --disable-smb \
+                        --disable-uri-rewrite\
+                        --disable-xbel \
+                        --without-bzlib \
+                        --without-gpm \
+                        --without-idn \
+                        --without-gnutls \
+                        --without-libiconv \
+                        --without-lua \
+                        --with-openssl="$(STAGING_DIR)/usr" \
+                        --without-spidermonkey\
+                        --without-x\
+                        --without-zlib \
+                        --disable-ipv6 \
+ 	);
 endef
 
 define Package/elinks/install