chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: don't hard-code binary paths in initrd-*.service
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3f6493773207d01da664b4dbd928db3a92a580a5..afd259a2e5888a214e6aa43cbf3821adebcdd9cb 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,16
+32,16
@@
SUBDIRS = . po
.SECONDARY:
LIBUDEV_CURRENT=3
.SECONDARY:
LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=
1
+LIBUDEV_REVISION=
2
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=
3
-LIBSYSTEMD_LOGIN_REVISION=
11
-LIBSYSTEMD_LOGIN_AGE=
3
+LIBSYSTEMD_LOGIN_CURRENT=
4
+LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_AGE=
4
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=7
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=7
@@
-382,11
+382,7
@@
dist_systemunit_DATA = \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-parse-etc.service \
- units/initrd-cleanup.service \
- units/initrd-switch-root.target \
- units/initrd-udevadm-cleanup-db.service \
- units/initrd-switch-root.service
+ units/initrd-switch-root.target
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-418,7
+414,11
@@
nodist_systemunit_DATA = \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/debug-shell.service
+ units/debug-shell.service \
+ units/initrd-parse-etc.service \
+ units/initrd-cleanup.service \
+ units/initrd-udevadm-cleanup-db.service \
+ units/initrd-switch-root.service
dist_userunit_DATA = \
units/user/default.target \
dist_userunit_DATA = \
units/user/default.target \
@@
-460,6
+460,10
@@
EXTRA_DIST += \
units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
+ units/initrd-parse-etc.service.in \
+ units/initrd-cleanup.service.in \
+ units/initrd-udevadm-cleanup-db.service.in \
+ units/initrd-switch-root.service.in \
introspect.awk \
man/custom-html.xsl
introspect.awk \
man/custom-html.xsl
@@
-3513,8
+3517,8
@@
PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
SPHINXOPTS = -D latex_paper_size=$(PAPER)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
SPHINXOPTS = -D latex_paper_size=$(PAPER)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
- $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/
man
/python-systemd/
- $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/
man
/python-systemd/
+ $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/
docs
/python-systemd/
+ $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/
docs
/python-systemd/
destdir-sphinx: all
dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
destdir-sphinx: all
dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
@@
-3850,7
+3854,7
@@
doc-sync: all destdir-sphinx
gtkdoc-rebase --html-dir=docs/gudev/html --online
rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
gtkdoc-rebase --html-dir=docs/gudev/html --online
rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
- rsync -av --delete --omit-dir-times
man/python-systemd/ $(www_target)/man
/python-systemd/
+ rsync -av --delete --omit-dir-times
docs/python-systemd/ $(www_target)
/python-systemd/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"