X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/811151c6ecd6e7b73a13e0aa3ddd38861a56a3fb..aafabbeea6fc83017ef29d0bb8f2331ec6da6624:/openwrt/package/lzo/Makefile

diff --git a/openwrt/package/lzo/Makefile b/openwrt/package/lzo/Makefile
index cfc307993..dddc3ce88 100644
--- a/openwrt/package/lzo/Makefile
+++ b/openwrt/package/lzo/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBLZO,liblzo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured: 
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(strip $(TARGET_CFLAGS))" \
@@ -47,20 +47,20 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --enable-shared \
 		  --enable-static \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS_O="$(TARGET_CFLAGS)"
+	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CFLAGS_O="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	touch $(PKG_BUILD_DIR)/.built
+		all install
+	touch $@
 
 $(IPKG_LIBLZO):
 	install -d -m0755 $(IDIR_LIBLZO)/usr/lib
-	cp -fpR $(STAGING_DIR)/lib/liblzo.so.* $(IDIR_LIBLZO)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblzo.so.* $(IDIR_LIBLZO)/usr/lib
 	$(RSTRIP) $(IDIR_LIBLZO)
 	$(IPKG_BUILD) $(IDIR_LIBLZO) $(PACKAGE_DIR)
 
@@ -78,5 +78,5 @@ uninstall-dev:
 	  $(STAGING_DIR)/usr/include/lzo*.h \
 	  $(STAGING_DIR)/usr/lib/liblzo.{a,so*} \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev