diff options
Diffstat (limited to 'graphics/sane-backends/files/patch-backend__Makefile.in')
| -rw-r--r-- | graphics/sane-backends/files/patch-backend__Makefile.in | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/graphics/sane-backends/files/patch-backend__Makefile.in b/graphics/sane-backends/files/patch-backend__Makefile.in index 93d0e1becbbb..8ded1b343d72 100644 --- a/graphics/sane-backends/files/patch-backend__Makefile.in +++ b/graphics/sane-backends/files/patch-backend__Makefile.in @@ -1,15 +1,15 @@ ---- backend/Makefile.in.orig 2010-04-14 09:52:59.000000000 +0900 -+++ backend/Makefile.in 2010-05-10 21:51:54.000000000 +0900 -@@ -1244,7 +1244,7 @@ - libxerox_mfp_la_LIBADD = - am_libxerox_mfp_la_OBJECTS = libxerox_mfp_la-xerox_mfp.lo - libxerox_mfp_la_OBJECTS = $(am_libxerox_mfp_la_OBJECTS) +--- ./backend/Makefile.in.orig 2014-01-05 18:05:50.000000000 -0200 ++++ ./backend/Makefile.in 2014-01-05 18:06:53.000000000 -0200 +@@ -1470,7 +1470,7 @@ + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ + am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane +DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -@@ -4701,7 +4701,7 @@ +@@ -5385,7 +5385,7 @@ @# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*. @# Having two libsane's can cause issues so get rid of it. -rm -f $(DESTDIR)$(sanelibdir)/libsane.* @@ -18,11 +18,12 @@ test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d" @list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \ if test ! -r $${cfg}; then continue; fi; \ -@@ -4712,6 +4712,7 @@ - $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \ +@@ -5393,7 +5393,7 @@ + echo NOT overwriting $${cfg} in $(configdir)...; \ + else \ + echo installing $${cfg} in $(configdir)/$${cfg}...; \ +- $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \ ++ $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} \ || exit 1; \ fi; \ -+ $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg}; \ done - - install-firmware-path: |