shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

build-sys: fix generation of user@.service

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-12-27 12:08:04 -05:00
parent 3dc9f55d6e
commit 4acbce7979
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -489,7 +489,7 @@ EXTRA_DIST += \
units/user/systemd-exit.service.in \ units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \ units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \ units/systemd-fsck-root.service.in \
units/user@.service.in \ units/user@.service.m4.in \
units/systemd-udevd.service \ units/systemd-udevd.service \
units/systemd-udev-trigger.service \ units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \ units/systemd-udev-settle.service \
@ -508,7 +508,8 @@ CLEANFILES += \
units/console-shell.service.m4 \ units/console-shell.service.m4 \
units/console-getty.service.m4 \ units/console-getty.service.m4 \
units/container-getty@.service.m4 \ units/container-getty@.service.m4 \
units/rescue.service.m4 units/rescue.service.m4 \
units/user@.service.m4
if HAVE_SYSV_COMPAT if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \ nodist_systemunit_DATA += \
@ -4612,11 +4613,11 @@ src/%: src/%.m4
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
units/%: units/%.m4 units/%: units/%.m4
$(AM_V_M4)$(MKDIR_P) $(dir $@) $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
units/user/%: units/%.m4 units/user/%: units/%.m4
$(AM_V_M4)$(MKDIR_P) $(dir $@) $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
if ENABLE_POLKIT if ENABLE_POLKIT

4
configure.ac
View File

@ -76,6 +76,8 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod])
AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec]) AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec])
M4_DEFINES=
# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
m4_ifdef([GTK_DOC_CHECK], [ m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.18],[--flavour no-tmpl])], GTK_DOC_CHECK([1.18],[--flavour no-tmpl])],
@ -808,6 +810,7 @@ AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by de
if test "x$enable_kdbus" == "xyes"; then if test "x$enable_kdbus" == "xyes"; then
AC_DEFINE(ENABLE_KDBUS, 1, [Define if kdbus support is to be enabled]) AC_DEFINE(ENABLE_KDBUS, 1, [Define if kdbus support is to be enabled])
have_kdbus=yes have_kdbus=yes
M4_DEFINES="$M4_DEFINES -DENABLE_KDBUS"
fi fi
AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"]) AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"])
@ -923,7 +926,6 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
# Location of the init scripts as mandated by LSB # Location of the init scripts as mandated by LSB
SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVINIT_PATH=/etc/init.d
SYSTEM_SYSVRCND_PATH=/etc/rc.d SYSTEM_SYSVRCND_PATH=/etc/rc.d
M4_DEFINES=
AC_ARG_WITH([sysvinit-path], AC_ARG_WITH([sysvinit-path],
[AS_HELP_STRING([--with-sysvinit-path=PATH], [AS_HELP_STRING([--with-sysvinit-path=PATH],

2
units/.gitignore vendored
View File

@ -65,4 +65,4 @@
/systemd-update-utmp.service /systemd-update-utmp.service
/systemd-user-sessions.service /systemd-user-sessions.service
/systemd-vconsole-setup.service /systemd-vconsole-setup.service
/user@.service /user@.service.m4

0
units/user@.service.in → units/user@.service.m4.in
View File