mark dibbler 2.6 only, it needs <linux/ip_mp_alg.h> to build

[openwrt/svn-archive/archive.git] / libs / libjpeg / Makefile

diff --git a/libs/libjpeg/Makefile b/libs/libjpeg/Makefile
index f9fe70d21c67ecd1e54a5d41ad047194e56d8b1f..4d5d62bcef921fe529f6a1a618e761fa22436a6b 100644 (file)
--- a/libs/libjpeg/Makefile
+++ b/libs/libjpeg/Makefile
@@ -21,7 +21,7 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-PKG_BUILDDEP:=libtool
+PKG_BUILD_DEPENDS:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -66,7 +66,8 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                prefix="$(PKG_INSTALL_DIR)/usr" \
                exec_prefix="$(PKG_INSTALL_DIR)/usr" \
-               all install-headers install-lib install
+               all install-headers install-lib install \
+               LIBTOOL="./libtool --tag=CC"
 endef
 
 define Build/InstallDev
@@ -86,12 +87,12 @@ define Build/UninstallDev
 endef
 
 define Package/libjpeg/install
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(1)/usr/lib/
 endef
 
 define Package/jpeg-tools/install
-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/*jpeg* $(1)/usr/bin/
 endef