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

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 249299fc7..d72cc0ce4 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -5,11 +5,12 @@
 # See /LICENSE for more information.
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=opkg
 PKG_REV:=215
 PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -37,7 +38,7 @@ 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)
@@ -47,6 +48,7 @@ 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,9 +69,8 @@ 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/