clean up tiff makefile and fix avr32 compile

[packages.git] / libs / tiff / Makefile

diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index 1cdfe68..d765223 100644 (file)
--- a/libs/tiff/Makefile
+++ b/libs/tiff/Makefile
@@ -14,11 +14,10 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= http://libtiff.maptools.org/dl/
+PKG_FIXUP := libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-CONFIGURE_ARGS_XTRA+=--without-x
-
 define Package/libtiff
   SECTION:=libs
   CATEGORY:=Libraries
@@ -26,28 +25,13 @@ define Package/libtiff
   DEPENDS:=+zlib +libjpeg
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
-endef
+CONFIGURE_ARGS += --without-x
+MAKE_FLAGS += all install DESTDIR=$(PKG_INSTALL_DIR)
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/{lib,include}
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libtif{f,fxx}.la
 endef
 
 define Package/tiff/Install