summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am14
-rw-r--r--configure.ac9
2 files changed, 13 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 627538d23c..61b18b3273 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)
diff --git a/configure.ac b/configure.ac
index 1483fcda5c..9eec8016bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,8 @@ SPECIAL_SYSLOG_SERVICE=syslog.service
# Location of the init scripts as mandated by LSB
SYSTEM_SYSVINIT_PATH=/etc/init.d
+M4_DISTRO_FLAG=
+
case $with_distro in
fedora)
SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
@@ -187,32 +189,38 @@ case $with_distro in
SPECIAL_DBUS_SERVICE=messagebus.service
SPECIAL_SYSLOG_SERVICE=rsyslog.service
AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL])
+ M4_DISTRO_FLAG=-DTARGET_FEDORA=1
;;
suse)
SYSTEM_SYSVRCND_PATH=/etc/init.d
AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES])
+ M4_DISTRO_FLAG=-DTARGET_SUSE=1
;;
debian)
SYSTEM_SYSVRCND_PATH=/etc
SPECIAL_SYSLOG_SERVICE=rsyslog.service
AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian/Ubuntu])
+ M4_DISTRO_FLAG=-DTARGET_DEBIAN=1
;;
arch)
SYSTEM_SYSVINIT_PATH=/etc/rc.d
SYSTEM_SYSVRCND_PATH=/etc
SPECIAL_SYSLOG_SERVICE=syslog-ng.service
AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux])
+ M4_DISTRO_FLAG=-DTARGET_ARCH=1
;;
gentoo)
SYSTEM_SYSVRCND_PATH=/etc
SPECIAL_SYSLOG_SERVICE=syslog-ng.service
AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo])
+ M4_DISTRO_FLAG=-DTARGET_GENTOO=1
;;
slackware)
SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
SYSTEM_SYSVRCND_PATH=/etc/rc.d
SPECIAL_DBUS_SERVICE=messagebus.service
AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
+ M4_DISTRO_FLAG=-DTARGET_SLACKWARE=1
;;
other)
AS_IF([test "x$with_sysvinit_path" = "x"],
@@ -257,6 +265,7 @@ AC_SUBST(SYSTEM_SYSVINIT_PATH)
AC_SUBST(SYSTEM_SYSVRCND_PATH)
AC_SUBST(SPECIAL_DBUS_SERVICE)
AC_SUBST(SPECIAL_SYSLOG_SERVICE)
+AC_SUBST(M4_DISTRO_FLAG)
AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)