mirror of
https://git.freebsd.org/ports.git
synced 2025-06-05 21:00:30 -04:00
9dc2451764
while here: - Use options helpers properly PR: ports/185513 Submitted by: KATO Tsuguru <tkato432@yahoo.com>
29 lines
1.3 KiB
Text
29 lines
1.3 KiB
Text
--- ./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
|
|
@@ -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.*
|
|
- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
|
|
+ test -z "$(configdir)/dist" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dist"
|
|
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; \
|
|
@@ -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; \
|
|
done
|