From f39675846ac05f3b08523164a4fbd092cb859ff0 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Thu, 10 Dec 2015 02:18:35 +0000 Subject: build-sys: regenerate %.m4 -> % on reconfigure Fixes: ``` $ ./configure ... --enable-resolved $ make $ cat tmpfiles.d/etc.conf ... L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf ... $ ./configure ... --disable-resolved $ make $ cat tmpfiles.d/etc.conf ... L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf ... ``` --- Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index cb2e0b38fc..2f619cdeca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5972,24 +5972,24 @@ src/%.c: src/%.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) < $< > $@ -src/%: src/%.m4 +src/%: src/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ -sysusers.d/%: sysusers.d/%.m4 +sysusers.d/%: sysusers.d/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ -tmpfiles.d/%: tmpfiles.d/%.m4 +tmpfiles.d/%: tmpfiles.d/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ -units/%: units/%.m4 +units/%: units/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ -units/user/%: units/user/%.m4 +units/user/%: units/user/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ -- cgit v1.2.3-54-g00ecf