pkgincludedir=$(includedir)/systemd
# And these are the special ones for /
-rootdir=@rootdir@
-rootbindir=$(rootdir)/bin
-rootlibexecdir=$(rootdir)/lib/systemd
+rootprefix=@rootprefix@
+rootbindir=$(rootprefix)/bin
+rootlibexecdir=$(rootprefix)/lib/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemunitdir=$(rootdir)/lib/systemd/system
+systemunitdir=$(rootprefix)/lib/systemd/system
CLEANFILES =
EXTRA_DIST =
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+ -DROOTPREFIX=\"$(rootprefix)\" \
-DRUNTIME_DIR=\"/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
src/polkit.h \
src/dbus-loop.h \
src/spawn-agent.h \
- src/acl-util.h
+ src/acl-util.h \
+ src/logs-show.h
MANPAGES = \
man/systemd.1 \
src/pager.c \
src/install.c \
src/spawn-agent.c \
- src/logs-show.c
+ src/logs-show.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
src/cgroup-util.c
nodist_systemd_journald_SOURCES = \
- src/journal/journald-gperf.c
+ src/journal/journald-gperf.c
systemd_journald_CFLAGS = \
$(AM_CFLAGS) \
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
src/pager.c \
- src/logs-show.c
+ src/logs-show.c
systemd_journalctl_LDADD = \
libsystemd-basic.la \
- libsystemd-journal.la
+ libsystemd-journal.la
if HAVE_XZ
systemd_journalctl_SOURCES += \
src/journal/compress.c
systemd_journalctl_CFLAGS = \
- $(AM_CFLAGS) \
+ $(AM_CFLAGS) \
$(XZ_CFLAGS)
systemd_journalctl_LDADD += \
$(XZ_LIBS)
src/journal/compress.c
test_journal_CFLAGS = \
- $(AM_CFLAGS) \
+ $(AM_CFLAGS) \
$(XZ_CFLAGS)
test_journal_LDADD += \
test-journal
pkginclude_HEADERS += \
- src/journal/sd-journal.h
+ src/journal/sd-journal.h \
+ src/journal/sd-messages.h
lib_LTLIBRARIES += \
libsystemd-journal.la
journal-install-data-hook
EXTRA_DIST += \
+ src/journal/journald.h \
src/journal/journal-def.h \
src/journal/journal-internal.h \
src/journal/journal-file.h \
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
units/systemd-journald.service.in \
- src/journal/journald-gperf.gperf
+ src/journal/journald-gperf.gperf
CLEANFILES += \
- src/journal/journald-gperf.c
+ src/journal/journald-gperf.c
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
- --with-rootdir=$$dc_install_base/$(rootdir)
+ --with-rootprefix=$$dc_install_base/$(rootprefix)
upload: all distcheck
cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/