X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/af934b189ee92cb39a2559c9666b9538b3ba443b..f0097c6f30ae0c97d12ac4ef253f44792ebbd69d:/package/opkg/Makefile

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index e67584764..6894ae7cb 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -1,15 +1,16 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=opkg
-PKG_REV:=215
+PKG_REV:=513
 PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -40,14 +41,14 @@ define Package/opkg/conffiles
 /etc/opkg.conf
 endef
 
-TARGET_CFLAGS += $(FPIC) $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds)
+TARGET_CFLAGS += $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds)
 EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS += $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
 CONFIGURE_ARGS += \
 	--disable-curl \
 	--disable-gpg \
-	--with-ipkgetcdir=/etc
+	--with-opkgetcdir=/etc \
+	--with-opkglockfile=/var/lock/opkg.lock
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
@@ -71,8 +72,6 @@ define Package/opkg/install
 	$(INSTALL_DATA) ./files/opkg.conf $(1)/etc/
 	$(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/
 endef
 
 define Build/InstallDev