diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 10:01:38 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 10:01:38 +0200 |
| commit | 56fb7fc262bbdf15a1bc5b3638684012934431b8 (patch) | |
| tree | 739943fb84e689f1dc233bb64d0feca4e41bcd83 /debian/patches/multiarch_dll_search_path.patch | |
| parent | e94622c319e4307617b202f19d3ec05b21a9bb49 (diff) | |
Refresh / remove applied patchesexperimental/1.0.25+git20150927-1
Diffstat (limited to 'debian/patches/multiarch_dll_search_path.patch')
| -rw-r--r-- | debian/patches/multiarch_dll_search_path.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/multiarch_dll_search_path.patch b/debian/patches/multiarch_dll_search_path.patch index 7c24d21..b20995e 100644 --- a/debian/patches/multiarch_dll_search_path.patch +++ b/debian/patches/multiarch_dll_search_path.patch @@ -11,7 +11,7 @@ Index: experimental/backend/dll.c if (path) { -- src_len = strlen (path) + strlen (STRINGIFY (LIBDIR)) + 1 + 1; +- src_len = strlen (path) + strlen (LIBDIR) + 1 + 1; + src_len = strlen (path) + strlen (DEB_DLL_LIBDIR) + 1 + 1; src = malloc (src_len); if (!src) @@ -20,12 +20,12 @@ Index: experimental/backend/dll.c return SANE_STATUS_NO_MEM; } orig_src = src; -- snprintf (src, src_len, "%s:%s", path, STRINGIFY (LIBDIR)); +- snprintf (src, src_len, "%s:%s", path, LIBDIR); + snprintf (src, src_len, "%s:%s", path, DEB_DLL_LIBDIR); } else { -- src = STRINGIFY (LIBDIR); +- src = LIBDIR; - src = strdup (src); + src = strdup (DEB_DLL_LIBDIR); if (!src) @@ -35,11 +35,11 @@ Index: experimental/backend/Makefile.in =================================================================== --- experimental.orig/backend/Makefile.in +++ experimental/backend/Makefile.in -@@ -1887,7 +1887,7 @@ target_alias = @target_alias@ +@@ -1911,7 +1911,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ --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\"" +AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" AM_LDFLAGS = @STRICT_LDFLAGS@ # The -rpath option is added because we are creating _LTLIBRARIES based |