picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build-sys: only install libexecdir/resolv.conf if resolved is enabled (#5826) 

as mentioned in https://github.com/systemd/systemd/pull/5811
This commit is contained in:
userwithuid 2017-04-27 17:22:40 +00:00 committed by Zbigniew Jędrzejewski-Szmek
parent 77018a8c26
commit d8431fc3f4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -5599,6 +5599,9 @@ GENERAL_ALIASES += \
nodist_pkgsysconf_DATA += \
src/resolve/resolved.conf
dist_rootlibexec_DATA += \
src/resolve/resolv.conf
libnss_resolve_la_SOURCES = \
src/nss-resolve/nss-resolve.sym \
src/nss-resolve/nss-resolve.c
@ -5737,9 +5740,6 @@ EXTRA_DIST += \
units/systemd-resolved.service.m4.in \
src/resolve/resolved.conf.in
dist_rootlibexec_DATA += \
src/resolve/resolv.conf
# ------------------------------------------------------------------------------
if ENABLE_NETWORKD
rootlibexec_PROGRAMS += \

6
src/resolve/meson.build
View File

@ -135,10 +135,10 @@ if conf.get('ENABLE_RESOLVED', 0) == 1
configuration : substs)
install_data(resolved_conf,
install_dir : pkgsysconfdir)
endif
install_data('resolv.conf',
install_dir : rootlibexecdir)
install_data('resolv.conf',
install_dir : rootlibexecdir)
endif
tests += [
[['src/resolve/test-resolve-tables.c',