X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=5674f1019a333d178f3e6ae5df7ae6c9b5f7f821;hb=cdefbd6aebc43c89aa1eafacd2edc10b605dfee7;hp=8885ab83d128f357f8ada266d73c730bcf3bbad8;hpb=0aee68ad028e696934367045e652a65865c0de52;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 8885ab83d..5674f1019 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
@@ -3419,7 +3421,6 @@ _journal_la_SOURCES = \
 _journal_la_CFLAGS = \
 	$(AM_CFLAGS) \
         -fvisibility=default \
-	-Wno-missing-prototypes \
 	$(PYTHON_CFLAGS)
 
 _journal_la_LDFLAGS = \
@@ -3451,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' \