X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ebd96b67234eec425fa6707b687440ba2fc1d485..1546e3e7d3d7aa9cedfe9dbd5c9784ef1b81759f:/package/opkg/Makefile

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 3a5ba449f..4d702bae9 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=opkg
-PKG_REV:=528
+PKG_REV:=576
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -18,6 +18,7 @@ PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_FIXUP = libtool
+PKG_REMOVE_FILES = autogen.sh aclocal.m4
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -26,6 +27,7 @@ define Package/opkg
   SECTION:=base
   CATEGORY:=Base system
   TITLE:=opkg package management system
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   URL:=http://wiki.openmoko.org/wiki/Opkg
 endef
 
@@ -52,13 +54,6 @@ CONFIGURE_ARGS += \
 	--with-opkgetcdir=/etc \
 	--with-opkglockfile=/var/lock/opkg.lock
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		autoreconf -v --install || exit 1 \
-	);
-	$(call Build/Configure/Default)
-endef
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
@@ -81,20 +76,15 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libopkg $(1)/usr/include/
 endef
 
-$(eval $(call BuildPackage,opkg))
 
+HOST_BUILD_DEPENDS:=libtool/host
 
-HOST_CONFIGURE_ARGS += \
+HOST_CONFIGURE_ARGS+= \
 	--disable-curl \
 	--disable-gpg \
 	--with-opkgetcdir=/etc \
 	--with-opkglockfile=/tmp/opkg.lock
 
-define Host/Configure
-	(cd $(HOST_BUILD_DIR); autoreconf -v --install || exit 1)
-	$(call Host/Configure/Default)	
-endef
-
 define Host/Compile
 	$(MAKE) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all
 endef
@@ -103,4 +93,5 @@ define Host/Install
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/opkg-cl $(STAGING_DIR_HOST)/bin/opkg
 endef
 
+$(eval $(call BuildPackage,opkg))
 $(eval $(call HostBuild))