packages/sane-backends: fix dependencies (closes: #9884)

[packages.git] / utils / sane-backends / Makefile

diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile
index 90e96a3..77eb073 100644 (file)
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@@ -1,20 +1,23 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sane-backends
-PKG_VERSION:=1.0.19
+PKG_VERSION:=1.0.22
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_MD5SUM:=8c0936272dcfd4e98c51512699f1c06f
+PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION) \
+       https://alioth.debian.org/frs/download.php/3503
+PKG_MD5SUM:=fadf56a60f4776bfb24491f66b617cf5
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,7 +47,7 @@ define Package/sane-libs
   $(call Package/sane-backends/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libjpeg +libpthread +libusb
+  DEPENDS:=+libjpeg +libtiff +libusb
   TITLE+= (libraries)
 endef
 
@@ -52,7 +55,7 @@ define Package/sane-libs/description
 $(call Package/sane-backends/Default/description)
  This package contains the SANE shared libraries.
 endef
- 
+
 define Package/sane-frontends
   $(call Package/sane-backends/Default)
   SECTION:=utils
@@ -65,19 +68,23 @@ define Package/sane-frontends/description
 $(call Package/sane-backends/Default/description)
  This package contains the SANE frontends.
 endef
- 
+
+TARGET_LDFLAGS += \
+       -Wl,-rpath-link $(STAGING_DIR)/usr/lib \
+       -Wl,-rpath-link $(PKG_BUILD_DIR)/backend/.libs
+
 CONFIGURE_ARGS+= \
        --enable-shared \
        --enable-static \
-       --disable-ipv6 \
        --disable-translations \
+       --disable-latex \
        --without-gphoto2 \
        --disable-debug \
+       --without-snmp
 
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+define Build/Configure
+       mkdir -p $(PKG_BUILD_DIR)/backend/.libs
+       $(Build/Configure/Default)
 endef
 
 define Package/sane-backends/conffiles
@@ -86,7 +93,7 @@ endef
 
 define Package/sane-backends/install
        $(INSTALL_DIR) $(1)/etc/sane.d
-       $(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
 endef
@@ -104,9 +111,9 @@ define Package/sane-frontends/install
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/sane $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.{a,so*} $(1)/usr/lib/
 endef