X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=12c2d2e93b57ae70f87f7c5c955880a0b06ad2e1;hp=730db1d5a888403b65fd687bd7c74a0808d39c53;hb=25ea79fe0756c3c46a16c0c19bf3380a30382a1c;hpb=b51fc639f01ee6194af3e7e944a79accce474fe1

diff --git a/Makefile.am b/Makefile.am
index 730db1d5a..12c2d2e93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ rpmmacrosdir=$(sysconfdir)/rpm
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
+userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -73,6 +74,7 @@ systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
+systempresetdir=$(rootprefix)/lib/systemd/system-preset
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(udevlibexecdir)
 udevrulesdir = $(udevlibexecdir)/rules.d
@@ -469,7 +471,7 @@ MANPAGES = \
 	man/systemd.conf.5 \
 	man/tmpfiles.d.5 \
 	man/hostname.5 \
-	man/timezone.5 \
+	man/localtime.5 \
 	man/machine-id.5 \
 	man/locale.conf.5 \
 	man/os-release.5 \
@@ -3408,6 +3410,37 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
+if HAVE_PYTHON_DEVEL
+
+pkgpyexec_LTLIBRARIES = \
+	_journal.la
+
+_journal_la_SOURCES = \
+	src/python-systemd/_journal.c
+
+_journal_la_CFLAGS = \
+	$(AM_CFLAGS) \
+        -fvisibility=default \
+	$(PYTHON_CFLAGS)
+
+_journal_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-shared \
+	-module \
+	-avoid-version
+
+_journal_la_LIBADD = \
+	$(PYTHON_LIBS) \
+	libsystemd-journal.la
+
+dist_pkgpyexec_PYTHON = \
+	src/python-systemd/journal.py \
+	src/python-systemd/__init__.py
+
+endif
+
+# ------------------------------------------------------------------------------
+
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED)	-e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
@@ -3419,6 +3452,8 @@ SED_PROCESS = \
 		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
 		-e 's,@systemunitdir\@,$(systemunitdir),g' \
 		-e 's,@userunitdir\@,$(userunitdir),g' \
+		-e 's,@systempresetdir\@,$(systempresetdir),g' \
+		-e 's,@userpresetdir\@,$(userpresetdir),g' \
 		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \