mac80211: fix depends

[openwrt.git] / package / opkg / Makefile

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 249299f..9c87e48 100644 (file)
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -5,9 +5,10 @@
 # See /LICENSE for more information.
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=opkg
-PKG_REV:=215
+PKG_REV:=284
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -37,16 +38,16 @@ define Package/opkg/description
 endef
 
 define Package/opkg/conffiles
-/etc/opkg/opkg.conf
+/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
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
@@ -67,12 +68,9 @@ define Package/opkg/install
        $(INSTALL_DIR) $(1)/usr/lib/opkg
        $(INSTALL_DIR) $(1)/bin
        $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_DIR) $(1)/etc/opkg
-       $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/opkg/
-       $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg/opkg.conf
+       $(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