X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fopkg%2FMakefile;h=d262a70e7251d817f8b1835be6af051b171b82fa;hb=2e98a06d146190e2c99f3f1ab5767733927f8d02;hp=e8aebcbb4802f3a22c5f6af7aabe23d3c4e6b90e;hpb=1468e6557266fd77a3522baeae7088709327071b;p=openwrt-10.03%2F.git

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index e8aebcbb4..d262a70e7 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -7,9 +7,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opkg
-PKG_REV:=4561
+PKG_REV:=4564
 PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -36,6 +36,11 @@ define Package/opkg/description
   opkg knows how to install both .ipk and .deb packages.
 endef
 
+define Package/opkg/conffiles
+/etc/opkg.conf
+endef
+
+TARGET_CFLAGS += $(FPIC)
 EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib
 EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
@@ -52,14 +57,17 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
+		CC="$(TARGET_CC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/opkg/install
-	$(INSTALL_BIN) ./files/postinst $(1)/CONTROL/postinst
+	$(INSTALL_DIR) $(1)/usr/lib/opkg
 	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/opkg.conf $(1)/etc/
+	$(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),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/