From 519ff57bed9391c9c178f660648669f4c77b7d3a Mon Sep 17 00:00:00 2001
From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date: Sat, 12 Aug 2017 15:03:51 +0900
Subject: [PATCH] install: Make sure configuration files get created before
 install

---
 backend/Makefile.am | 6 +++++-
 backend/Makefile.in | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/Makefile.am b/backend/Makefile.am
index a28e749f1..18695a4a8 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -74,6 +74,10 @@ BACKEND_CONFS= abaton.conf agfafocus.conf apple.conf artec.conf \
 	       teco1.conf teco2.conf teco3.conf test.conf \
 	       u12.conf umax1220u.conf umax.conf umax_pp.conf v4l.conf \
 	       xerox_mfp.conf dll.conf saned.conf
+# Although ./configure sets up BACKEND_CONFS_ENABLED it does not take
+# into account the fact that some backends don't have a configuration
+# file.  The becfg should depend on BACKEND_CONFS.  The install-becfg
+# target uses BACKEND_CONFS_ENABLED and silently skips missing files.
 becfg: $(BACKEND_CONFS)
 
 SUFFIXES = .conf.in .conf
@@ -92,7 +96,7 @@ install-data-hook: install-becfg install-firmware-path $(INSTALL_LOCKPATH)
 # Custom install target to install config files.  Do not overwrite
 # files that have been previously installed so that user modifications
 # are not lost.
-install-becfg:
+install-becfg: becfg
 	@# Libtool has a bug where it will sometimes symlink the last
 	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
 	@# Having two libsane's can cause issues so get rid of it.
diff --git a/backend/Makefile.in b/backend/Makefile.in
index 3017d5aa2..d1dca4a21 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -5619,6 +5619,10 @@ dll-preload.h:
 	  done; \
 	fi; \
 	echo "};" >> $@
+# Although ./configure sets up BACKEND_CONFS_ENABLED it does not take
+# into account the fact that some backends don't have a configuration
+# file.  The becfg should depend on BACKEND_CONFS.  The install-becfg
+# target uses BACKEND_CONFS_ENABLED and silently skips missing files.
 becfg: $(BACKEND_CONFS)
 .conf.in.conf:
 	@echo Generating $@ from $^
@@ -5635,7 +5639,7 @@ install-data-hook: install-becfg install-firmware-path $(INSTALL_LOCKPATH)
 # Custom install target to install config files.  Do not overwrite
 # files that have been previously installed so that user modifications
 # are not lost.
-install-becfg:
+install-becfg: becfg
 	@# Libtool has a bug where it will sometimes symlink the last
 	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
 	@# Having two libsane's can cause issues so get rid of it.