chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: add bus API and systemctl commands for altering cgroup parameters during runtime
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 60c5651d4ae6fa3fd37c2dad4cbf22eec311118f..33188294a955cf65eae0dbb97182b1662658a45b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-63,7
+63,7
@@
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=$(sysconfdir)/bash_completion.d
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
bashcompletiondir=$(sysconfdir)/bash_completion.d
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
-sysvrcddir=$(SYSTEM_SYSVRCND_PATH)
+sysvrc
n
ddir=$(SYSTEM_SYSVRCND_PATH)
varlogdir=$(localstatedir)/log
systemdstatedir=$(localstatedir)/lib/systemd
catalogstatedir=$(systemdstatedir)/catalog
varlogdir=$(localstatedir)/log
systemdstatedir=$(localstatedir)/lib/systemd
catalogstatedir=$(systemdstatedir)/catalog
@@
-377,24
+377,22
@@
EXTRA_DIST += \
introspect.awk \
man/custom-html.xsl
introspect.awk \
man/custom-html.xsl
-if HAVE_KMOD
EXTRA_DIST += \
units/systemd-modules-load.service.in
EXTRA_DIST += \
units/systemd-modules-load.service.in
-endif
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
units/rc-local.service \
units/halt-local.service
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
units/rc-local.service \
units/halt-local.service
-EXTRA_DIST += \
- units/rc-local.service.in \
- units/halt-local.service.in
-
systemgenerator_PROGRAMS += \
systemd-rc-local-generator
endif
systemgenerator_PROGRAMS += \
systemd-rc-local-generator
endif
+EXTRA_DIST += \
+ units/rc-local.service.in \
+ units/halt-local.service.in
+
dist_doc_DATA = \
README \
NEWS \
dist_doc_DATA = \
README \
NEWS \
@@
-769,6
+767,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/strv.h \
src/shared/strbuf.c \
src/shared/strbuf.h \
src/shared/strv.h \
src/shared/strbuf.c \
src/shared/strbuf.h \
+ src/shared/strxcpyx.c \
+ src/shared/strxcpyx.h \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
src/shared/log.c \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
src/shared/log.c \
@@
-3027,11
+3027,14
@@
systemd_bootchart_SOURCES = \
src/bootchart/svg.c
MANPAGES += \
src/bootchart/svg.c
MANPAGES += \
- man/systemd-bootchart.1
+ man/systemd-bootchart.1
\
man/bootchart.conf.5
rootlibexec_PROGRAMS += \
systemd-bootchart
man/bootchart.conf.5
rootlibexec_PROGRAMS += \
systemd-bootchart
+
+dist_pkgsysconf_DATA += \
+ src/bootchart/bootchart.conf
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-3939,16
+3942,16
@@
docs/sysvinit/README: docs/sysvinit/README.in
docs/var-log/README: docs/var-log/README.in
$(SED_PROCESS)
docs/var-log/README: docs/var-log/README.in
$(SED_PROCESS)
-EXTRA_DIST += \
- docs/sysvinit/README.in \
- docs/var-log/README.in
-
CLEANFILES += \
docs/sysvinit/README \
docs/var-log/README
endif
CLEANFILES += \
docs/sysvinit/README \
docs/var-log/README
endif
+EXTRA_DIST += \
+ docs/sysvinit/README.in \
+ docs/var-log/README.in
+
EXTRA_DIST += \
shell-completion/systemd-zsh-completion.zsh
EXTRA_DIST += \
shell-completion/systemd-zsh-completion.zsh
@@
-4102,11
+4105,14
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-rootprefix=$$dc_install_base \
--disable-split-usr
--with-rootprefix=$$dc_install_base \
--disable-split-usr
-
if HAVE_SYSV_COMPAT
DISTCHECK_CONFIGURE_FLAGS += \
--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
if HAVE_SYSV_COMPAT
DISTCHECK_CONFIGURE_FLAGS += \
--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
- --with-sysvrcnd-path=$$dc_install_base/$(sysvrcddir)
+ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
+else
+DISTCHECK_CONFIGURE_FLAGS += \
+ --with-sysvinit-path= \
+ --with-sysvrcnd-path=
endif
if ENABLE_GTK_DOC
endif
if ENABLE_GTK_DOC