From ac1cb335bee11d7f030b75d8e1553d9eb07f01a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 10 Dec 2016 13:49:05 +0100 Subject: Migrate to debhelper 10 --- debian/patches/0125-multiarch_dll_search_path.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'debian/patches/0125-multiarch_dll_search_path.patch') diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch index cc63bd6..21c93f6 100644 --- a/debian/patches/0125-multiarch_dll_search_path.patch +++ b/debian/patches/0125-multiarch_dll_search_path.patch @@ -44,3 +44,16 @@ Index: trunk/backend/Makefile.in AM_LDFLAGS = @STRICT_LDFLAGS@ # The -rpath option is added because we are creating _LTLIBRARIES based # on configure substitution. This causes automake to not know the +Index: trunk/backend/Makefile.am +=================================================================== +--- trunk.orig/backend/Makefile.am ++++ trunk/backend/Makefile.am +@@ -24,7 +24,7 @@ USB_LIBS = @USB_LIBS@ + SCSI_LIBS = @SCSI_LIBS@ + PTHREAD_LIBS = @PTHREAD_LIBS@ + +-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" ++AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" + + V_MAJOR = @V_MAJOR@ + V_MINOR = @V_MINOR@ -- cgit v1.2.3