X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/038622713d81c80868fe79b07366c5d6202e97a9..bfd6aeeee003ababc1861ca77d4199fb63d5a566:/package/ipkg/Makefile?ds=sidebyside

diff --git a/package/ipkg/Makefile b/package/ipkg/Makefile
index a0ec84a06..185c5f81c 100644
--- a/package/ipkg/Makefile
+++ b/package/ipkg/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ipkg
-PKG_VERSION:=0.99.145
+PKG_VERSION:=0.99.149
 PKG_RELEASE:=1
-PKG_MD5SUM:=d98799dbcf911f90a7c3c897713cc37a
+PKG_MD5SUM:=975cc419d6db5fb279dc58177c68373b
 
 PKG_SOURCE_URL:=http://www.handhelds.org/packages/ipkg
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -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)