summaryrefslogtreecommitdiff
path: root/debian/patches/0125-multiarch_dll_search_path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0125-multiarch_dll_search_path.patch')
-rw-r--r--debian/patches/0125-multiarch_dll_search_path.patch18
1 files changed, 2 insertions, 16 deletions
diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch
index de28245..a213060 100644
--- a/debian/patches/0125-multiarch_dll_search_path.patch
+++ b/debian/patches/0125-multiarch_dll_search_path.patch
@@ -7,7 +7,7 @@ Index: trunk/backend/dll.c
===================================================================
--- trunk.orig/backend/dll.c
+++ trunk/backend/dll.c
-@@ -450,7 +450,7 @@ load (struct backend *be)
+@@ -466,7 +466,7 @@ load (struct backend *be)
if (path)
{
@@ -16,7 +16,7 @@ Index: trunk/backend/dll.c
src = malloc (src_len);
if (!src)
{
-@@ -460,11 +460,11 @@ load (struct backend *be)
+@@ -476,11 +476,11 @@ load (struct backend *be)
if (orig_src)
free (orig_src);
orig_src = src;
@@ -30,20 +30,6 @@ Index: trunk/backend/dll.c
src = strdup (src);
if (!src)
{
-Index: trunk/backend/Makefile.in
-===================================================================
---- trunk.orig/backend/Makefile.in
-+++ trunk/backend/Makefile.in
-@@ -1753,7 +1753,8 @@ AMTAR = @AMTAR@
- AM_CFLAGS = @AM_CFLAGS@
- AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
- -I$(top_srcdir)/include $(USB_CFLAGS) \
-- -DLIBDIR="\"$(libdir)/sane\""
-+ -DLIBDIR="\"$(libdir)/sane\"" \
-+ -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\""
- AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
- AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS)
- AR = @AR@
Index: trunk/backend/Makefile.am
===================================================================
--- trunk.orig/backend/Makefile.am