mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

install: Make sure configuration files get created before install

merge-requests/1/head
Olaf Meeuwissen 2017-08-12 15:03:51 +09:00
rodzic f19a41e6f7
commit 519ff57bed
2 zmienionych plików z 10 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
backend/Makefile.am
Wyświetl plik

@ -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.

6
backend/Makefile.in
Wyświetl plik

@ -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.