diff options
| author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2015-11-24 14:28:47 +0200 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2015-11-25 13:32:23 +0200 |
| commit | 3a507111135e9f7905c955160890112426e73902 (patch) | |
| tree | 32e341b70457432f7940debb16736e2710417d33 /Makefile.am | |
| parent | 3a9ad49c8c8448875375a67913af98f74bca0ad7 (diff) | |
| download | connman-3a507111135e9f7905c955160890112426e73902.tar.gz | |
src: Add tmpfiles.d support for resolv.conf
Add tmpfiles.d support for creating the directory
[/var]/run/connman/ an making a link from /etc/resolv.conf.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 96abab7a..95082c11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,9 +63,11 @@ endif if SYSTEMD systemdunitdir = @SYSTEMD_UNITDIR@ - systemdunit_DATA = src/connman.service +tmpfilesdir = @SYSTEMD_TMPFILESDIR@ +nodist_tmpfiles_DATA = scripts/connman_resolvconf.conf + if VPN systemdunit_DATA += vpn/connman-vpn.service endif @@ -153,7 +155,8 @@ vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \ -Wl,--version-script=$(srcdir)/vpn/vpn.ver endif -BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) scripts/connman +BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) \ + scripts/connman scripts/connman_resolvconf.conf if VPN BUILT_SOURCES += vpn/builtin.h @@ -386,7 +389,8 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \ doc/connman.8.in doc/connman-vpn.8.in EXTRA_DIST += src/main.conf \ - src/eduroam.config + src/eduroam.config \ + scripts/connman_resolvconf.conf.in MANUAL_PAGES += doc/connmanctl.1 doc/connman.conf.5 \ doc/connman-service.config.5 doc/connman-vpn.conf.5 \ @@ -457,7 +461,8 @@ do_subst = $(AM_V_GEN)$(SED) \ -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ -e 's,[@]storagedir[@],$(storagedir),g' \ -e 's,[@]vpn_storagedir[@],$(vpn_storagedir),g' \ - -e 's,[@]localstatedir[@],$(localstatedir),g' + -e 's,[@]localstatedir[@],$(localstatedir),g' \ + -e 's,[@]runstatedir[@],$(runstatedir),g' %.1 : %.1.in $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -479,6 +484,10 @@ scripts/connman: scripts/connman.in Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) $(do_subst) < $< > $@ +scripts/connman_resolvconf.conf: scripts/connman_resolvconf.conf.in + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ + include/connman/version.h: include/version.h $(AM_V_at)$(MKDIR_P) include/connman $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@ |