chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: fix execution environment for a few services
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index c9a73e18ef6184316b4871c01e48d8a82765f869..e6366dd0049ba3876bd420ba7c154ebcdcc18bae 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-335,9
+335,6
@@
units/session/%: units/%.m4 Makefile
$(M4_PROCESS_SESSION)
CLEANFILES = \
$(M4_PROCESS_SESSION)
CLEANFILES = \
- src/systemd-interfaces.c \
- src/systemctl.c \
- src/systemadm.c \
units/systemd-initctl.service \
units/systemd-logger.service \
units/syslog.target \
units/systemd-initctl.service \
units/systemd-logger.service \
units/syslog.target \
@@
-350,7
+347,14
@@
CLEANFILES = \
man/systemd.special.7 \
man/systemd.special.html
man/systemd.special.7 \
man/systemd.special.html
-#if HAVE_XSLTPROC
+if HAVE_VALAC
+CLEANFILES += \
+ src/systemd-interfaces.c \
+ src/systemctl.c \
+ src/systemadm.c
+endif
+
+if HAVE_XSLTPROC
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
@@
-393,7
+397,7
@@
CLEANFILES += \
man/systemd.unit.html \
man/systemd.service.html \
man/systemd.special.html.in
man/systemd.unit.html \
man/systemd.service.html \
man/systemd.special.html.in
-
#
endif
+endif
install-data-hook:
$(MKDIR_P) -m 0755 \
install-data-hook:
$(MKDIR_P) -m 0755 \
@@
-405,8
+409,9
@@
install-data-hook:
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \
- $(DESTDIR)$(sysconfdir)/xdg/systemd \
- $(DESTDIR)/cgroup/debug
+ $(DESTDIR)$(sysconfdir)/xdg/systemd
+ $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup/systemd || \
+ echo "Don't forget to create /cgroup/systemd! Couldn't create it for you, continuing anyway."
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
rm -f session && \
$(LN_S) $(pkgsysconfdir)/session session )
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
rm -f session && \
$(LN_S) $(pkgsysconfdir)/session session )