chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install: create both session/system unit dirs, even if empty
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 26a2c95850387bb7157d116159c5dc7e81860737..d79a5239500dac2d5b847842b73615e044ad98ab 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-17,12
+17,12
@@
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
-pkgsysconfdir=$(sysconfdir)/systemd
dbuspolicydir=$(sysconfdir)/dbus-1/system.d
dbuspolicydir=$(sysconfdir)/dbus-1/system.d
-udevrulesdir=
/lib/udev/rules.d
+udevrulesdir=
@udevrulesdir@
+pkgsysconfdir=$(sysconfdir)/systemd
systemunitdir=$(pkgdatadir)/system
systemunitdir=$(pkgdatadir)/system
-sessionunitdir=$(pkgdatadir)/s
ystem
+sessionunitdir=$(pkgdatadir)/s
ession
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
@@
-35,8
+35,9
@@
AM_CPPFLAGS = \
-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
-# -DSYSTEMD_BINARY_PATH=\"/home/lennart/projects/systemd/systemd\"
-VALA_CFLAGS=-Wno-unused-variable -Wno-unused-function
+VALA_CFLAGS = \
+ -Wno-unused-variable \
+ -Wno-unused-function
sbin_PROGRAMS = \
systemd
sbin_PROGRAMS = \
systemd
@@
-60,27
+61,24
@@
noinst_PROGRAMS = \
test-ns \
test-loopback
test-ns \
test-loopback
-dbuspolicy_DATA = \
+d
ist_d
buspolicy_DATA = \
org.freedesktop.systemd1.conf
org.freedesktop.systemd1.conf
-udevrules_DATA = \
+
dist_
udevrules_DATA = \
99-systemd.rules
99-systemd.rules
-systemunit_DATA = \
+
dist_
systemunit_DATA = \
units/emergency.service \
units/emergency.service \
- systemd-initctl.service \
units/systemd-initctl.socket \
units/systemd-initctl.socket \
- systemd-logger.service \
units/systemd-logger.socket
units/systemd-logger.socket
+systemunit_DATA = \
+ systemd-initctl.service \
+ systemd-logger.service
+
EXTRA_DIST = \
EXTRA_DIST = \
- org.freedesktop.systemd1.conf \
- 99-systemd.rules \
- units/emergency.service \
units/systemd-initctl.service.in \
units/systemd-initctl.service.in \
- units/systemd-initctl.socket \
units/systemd-logger.service.in \
units/systemd-logger.service.in \
- units/systemd-logger.socket \
LICENSE \
README
LICENSE \
README
@@
-147,6
+145,21
@@
EXTRA_DIST += \
linux/auto_dev-ioctl.h \
initreq.h
linux/auto_dev-ioctl.h \
initreq.h
+dist_man_MANS = \
+ systemd.unit.5 \
+ systemd.service.5
+
+HTMLMANS = \
+ systemd.unit.html \
+ systemd.service.html
+
+dist_noinst_DATA = \
+ $(HTMLMANS)
+
+EXTRA_DIST += \
+ man/systemd.unit.xml \
+ man/systemd.service.xml
+
systemd_SOURCES = \
$(COMMON_SOURCES) \
main.c
systemd_SOURCES = \
$(COMMON_SOURCES) \
main.c
@@
-251,7
+264,28
@@
CLEANFILES = \
systemd-initctl.service \
systemd-logger.service
systemd-initctl.service \
systemd-logger.service
+if HAVE_XSLTPROC
+%.5: man/%.xml
+ $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+%.html: man/%.xml
+ $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+
+CLEANFILES += \
+ $(dist_man_MANS) \
+ $(HTMLMANS)
+endif
+
install-data-hook:
install-data-hook:
- $(MKDIR_P) $(DESTDIR)$(pkgsysconfdir)/system $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir) \
+ $(DESTDIR)$(sessionunitdir) \
+ $(DESTDIR)$(pkgsysconfdir)/system \
+ $(DESTDIR)$(pkgsysconfdir)/session \
+ $(DESTDIR)$(sysconfdir)/xdg/systemd \
+ $(DESTDIR)/cgroup/debug
rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session
rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session
+
+DISTCHECK_CONFIGURE_FLAGS = \
+ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)