X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=77274891da86cda5d98d61f8992bc7c2a17085f7;hp=627538d23cb2bccd4a6794c303a7776b51e53310;hb=bb009d81b05f4ceada118a94021f78386fc370ce;hpb=705dbf3aa3e95a4e591dcbc79774708d71b0e2e8

diff --git a/Makefile.am b/Makefile.am
index 627538d23..77274891d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -305,7 +305,7 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLA
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 SED_PROCESS = \
-	$(MKDIR_P) units && \
+	$(AM_V_GEN)$(MKDIR_P) units && \
 	$(SED)  -e 's,@libexecdir\@,$(libexecdir),g' \
 		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
@@ -320,19 +320,13 @@ units/systemd-logger.service: units/systemd-logger.service.in Makefile
 units/syslog.target: units/syslog.target.in Makefile
 	$(SED_PROCESS)
 
-M4_FLAGS =
-
-if TARGET_FEDORA
-M4_FLAGS += -DTARGET_FEDORA=1
-endif
-
 M4_PROCESS_SYSTEM = \
-	$(MKDIR_P) units && \
-	$(M4) -P $(M4_FLAGS) -DFOR_SYSTEM < $< > $@
+	$(AM_V_GEN)$(MKDIR_P) units && \
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM < $< > $@
 
 M4_PROCESS_SESSION = \
-	$(MKDIR_P) units/session && \
-	$(M4) -P $(M4_FLAGS) -DFOR_SESSION < $< > $@
+	$(AM_V_GEN)$(MKDIR_P) units/session && \
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION < $< > $@
 
 units/basic.target: units/basic.target.m4 Makefile
 	$(M4_PROCESS_SYSTEM)
@@ -368,11 +362,11 @@ CLEANFILES = \
 
 if HAVE_XSLTPROC
 man/%.5 man/%.7: man/%.xml
-	$(MKDIR_P) man
+	$(AM_V_GEN)$(MKDIR_P) man && \
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 man/%.html: man/%.xml
-	$(MKDIR_P) man
+	$(AM_V_GEN)$(MKDIR_P) man && \
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 CLEANFILES += \