X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=e668c09dd1a79871345ebf2cfc000f664f7b00f3;hb=67e5cc4f3ed41feaed399cfed77c6fbb41e14a8c;hp=09df759d0e5d0997d51ef79041fb5560d2352c7e;hpb=e6960940b6dc5ab81eb2fca4061c333e1795f38d;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 09df759d0..e668c09dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,12 +56,12 @@ usergeneratordir=$(pkglibexecdir)/user-generators
 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 =
@@ -89,6 +89,7 @@ AM_CPPFLAGS = \
 	-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\" \
@@ -591,7 +592,8 @@ EXTRA_DIST += \
 	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 \
@@ -925,7 +927,7 @@ systemctl_SOURCES = \
 	src/pager.c \
 	src/install.c \
 	src/spawn-agent.c \
-        src/logs-show.c
+	src/logs-show.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1172,7 +1174,7 @@ systemd_journald_SOURCES = \
 	src/cgroup-util.c
 
 nodist_systemd_journald_SOURCES = \
-        src/journal/journald-gperf.c
+	src/journal/journald-gperf.c
 
 systemd_journald_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1196,17 +1198,17 @@ endif
 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)
@@ -1228,7 +1230,7 @@ test_journal_SOURCES += \
 	src/journal/compress.c
 
 test_journal_CFLAGS = \
-        $(AM_CFLAGS) \
+	$(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 test_journal_LDADD += \
@@ -1288,7 +1290,8 @@ noinst_PROGRAMS += \
 	test-journal
 
 pkginclude_HEADERS += \
-	src/journal/sd-journal.h
+	src/journal/sd-journal.h \
+        src/journal/sd-messages.h
 
 lib_LTLIBRARIES += \
 	libsystemd-journal.la
@@ -1322,6 +1325,7 @@ INSTALL_DATA_HOOKS += \
 	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 \
@@ -1331,10 +1335,10 @@ EXTRA_DIST += \
 	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
@@ -2396,7 +2400,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--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/