diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-08-27 17:45:41 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-08-27 18:17:16 +0200 |
| commit | aeb50ff0bd4bbbca74c4695072232348351d512d (patch) | |
| tree | da9ccc62028fcaac678bb614561cf0471c92f36c /Makefile.am | |
| parent | 81fc054dc7c365545bca86d78bf36a12658cedb3 (diff) | |
tmpfiles: make resolv.conf entry conditional on resolved support
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index cbdf551fa8..70faed4acb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1940,14 +1940,16 @@ nodist_systemunit_DATA += \ units/systemd-tmpfiles-setup.service \ units/systemd-tmpfiles-clean.service +nodist_tmpfiles_DATA = \ + tmpfiles.d/etc.conf + dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/systemd-remote.conf \ tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf \ - tmpfiles.d/var.conf \ - tmpfiles.d/etc.conf + tmpfiles.d/var.conf if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ @@ -1970,10 +1972,14 @@ INSTALL_DIRS += \ endif EXTRA_DIST += \ + tmpfiles.d/etc.conf.m4 \ units/systemd-tmpfiles-setup-dev.service.in \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in +CLEANFILES += \ + tmpfiles.d/etc.conf + # ------------------------------------------------------------------------------ if ENABLE_SYSUSERS systemd_sysusers_SOURCES = \ @@ -5708,6 +5714,11 @@ src/%: src/%.m4 $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ +tmpfiles.d/%: tmpfiles.d/%.m4 + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ + + units/%: units/%.m4 $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ |