change the opkg path due to changes in the buildsystem, fixes incorrect path in snaps...

[openwrt.git] / package / opkg / Makefile

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 6cabdec..243e0b6 100644 (file)
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# 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.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=opkg
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=opkg

-PKG_REV:=503
+PKG_REV:=513

 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 


@@ -47,7 +47,8 @@ EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
 CONFIGURE_ARGS += \
        --disable-curl \
        --disable-gpg \
 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); \
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \


@@ -69,7 +70,7 @@ define Package/opkg/install
        $(INSTALL_DIR) $(1)/bin
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/bin
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/

-       $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf
+       $(SED) 's,$$$$S,$(TARGET),g' $(1)/etc/opkg.conf

        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
 endef
 
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
 endef