Fix ipkg : change configure to revert IPKG_STATE_DIR_PREFIX back to /usr/lib

[openwrt.git] / openwrt / package / ipkg / Makefile

diff --git a/openwrt/package/ipkg/Makefile b/openwrt/package/ipkg/Makefile
index a0ec84a069b435894bb8fa809736699797ac1520..2180ee7d3c2a1e10c1c65aa06c2a740bba60e855 100644 (file)
--- a/openwrt/package/ipkg/Makefile
+++ b/openwrt/package/ipkg/Makefile
@@ -36,8 +36,8 @@ $(PKG_BUILD_DIR)/.configured:
                  --datadir=/usr/share \
                  --includedir=/usr/include \
                  --infodir=/usr/share/info \
-                 --libdir=/lib \
-                 --libexecdir=/lib \
+                 --libdir=/usr/lib \
+                 --libexecdir=/usr/lib \
                  --localstatedir=/var \
                  --mandir=/usr/share/man \
                  --sbindir=/usr/sbin \
@@ -45,21 +45,21 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
        )
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC)
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               CC=$(TARGET_CC) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_IPKG):
        install -d -m0755 $(IDIR_IPKG)/bin
        cp -fpR $(PKG_INSTALL_DIR)/bin/ipkg-cl $(IDIR_IPKG)/bin/ipkg
-       install -d -m0755 $(IDIR_IPKG)/lib
-       cp -fpR $(PKG_INSTALL_DIR)/lib/libipkg.so.* $(IDIR_IPKG)/lib/
+       install -d -m0755 $(IDIR_IPKG)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipkg.so.* $(IDIR_IPKG)/usr/lib/
        $(RSTRIP) $(IDIR_IPKG)
        $(IPKG_BUILD) $(IDIR_IPKG) $(PACKAGE_DIR)