[package] fix lzo parallel build, patch from Raphael Huck
authorFlorian Fainelli <florian@openwrt.org>
Fri, 19 Mar 2010 16:23:44 +0000 (16:23 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Fri, 19 Mar 2010 16:23:44 +0000 (16:23 +0000)
SVN-Revision: 20301

libs/lzo/Makefile

index 5bc4d70..cf87511 100644 (file)
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lzo
 PKG_VERSION:=2.03
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/lzo/download/
 PKG_MD5SUM:=0c3d078c2e8ea5a88971089a2f02a726
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,9 +28,8 @@ define Package/liblzo
 endef
 
 define Package/liblzo/description
-       LZO is a data compression library which is suitable for data
-       de-/compression in real-time.
-       This means it favours speed over compression ratio.
+LZO is a data compression library which is suitable for data de-/compression in
+real-time. This means it favours speed over compression ratio.
 endef
 
 define Build/Configure
@@ -41,23 +41,19 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CFLAGS_O="$(TARGET_CFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+MAKE_FLAGS += CFLAGS_O="$(TARGET_CFLAGS)"
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lzo $(1)/usr/include/
+
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/liblzo/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,liblzo))