X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=21d833a4fc3f0548474a72f91ae4ccb39019e456;hb=b8079ae19b41c9b61850c796dddc601b826850e0;hp=fe54eadf356bd8faf9b812b377c86413ef81a02d;hpb=3606df64abfa79e8fad7bd75c8634c116a6f1c96;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index fe54eadf3..21d833a4f 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\" \
@@ -1171,6 +1172,9 @@ systemd_journald_SOURCES = \
 	src/acl-util.c \
 	src/cgroup-util.c
 
+nodist_systemd_journald_SOURCES = \
+        src/journal/journald-gperf.c
+
 systemd_journald_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(ACL_CFLAGS)
@@ -1302,6 +1306,9 @@ dist_systemunit_DATA += \
 nodist_systemunit_DATA += \
 	units/systemd-journald.service
 
+dist_pkgsysconf_DATA += \
+	src/journal/systemd-journald.conf
+
 pkgconfiglib_DATA += \
 	src/journal/libsystemd-journal.pc
 
@@ -1324,7 +1331,11 @@ EXTRA_DIST += \
 	src/journal/journal-rate-limit.h \
 	src/journal/libsystemd-journal.pc.in \
 	src/journal/libsystemd-journal.sym \
-	units/systemd-journald.service.in
+	units/systemd-journald.service.in \
+        src/journal/journald-gperf.gperf
+
+CLEANFILES += \
+        src/journal/journald-gperf.c
 
 # ------------------------------------------------------------------------------
 if ENABLE_BINFMT
@@ -2386,7 +2397,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/