Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	am-pretty.mk
#	config.mk.in
#	src/journal/Makefile
#	src/kernel-install/Makefile
#	src/libbasic/Makefile
#	src/libfirewall/Makefile
#	src/libshared/Makefile
#	src/libsystemd/Makefile
#	src/libsystemd/libsystemd-internal/Makefile
#	src/libsystemd/libsystemd-journal-internal/Makefile
#	src/libsystemd/src/Makefile
#	src/systemd-nspawn/Makefile
#	src/systemd-nspawn/nspawn-network.c
#	src/udev/udev.h

9 files changed, 16 insertions, 16 deletions

diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 66a38ea7f8..3c260f5ae6 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -21,7 +21,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 noinst_LTLIBRARIES += \
 	libshared.la
@@ -149,4 +149,4 @@ $(outdir)/libshared.la: \
 
 $(call amtarget2dir,src/shared,libshared.la)
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/bus-util.c b/src/libshared/bus-util.c
index 38557f0b8d..a874bb84cc 100644
--- a/src/libshared/bus-util.c
+++ b/src/libshared/bus-util.c
@@ -28,11 +28,11 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "sd-bus-protocol.h"
-#include "sd-bus.h"
-#include "sd-daemon.h"
-#include "sd-event.h"
-#include "sd-id128.h"
+#include <systemd/sd-bus-protocol.h>
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/libshared/condition.c b/src/libshared/condition.c
index f93785865e..1719a4c7a6 100644
--- a/src/libshared/condition.c
+++ b/src/libshared/condition.c
@@ -27,7 +27,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "apparmor-util.h"
diff --git a/src/libshared/logs-show.c b/src/libshared/logs-show.c
index 5eb3bd35c7..7ac6d49549 100644
--- a/src/libshared/logs-show.c
+++ b/src/libshared/logs-show.c
@@ -28,8 +28,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
-#include "sd-journal.h"
+#include <systemd/sd-id128.h>
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libshared/logs-show.h b/src/libshared/logs-show.h
index 9765a24ff2..682a4adc7b 100644
--- a/src/libshared/logs-show.h
+++ b/src/libshared/logs-show.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "macro.h"
 #include "output-mode.h"
diff --git a/src/libshared/machine-pool.c b/src/libshared/machine-pool.c
index e5674e4137..056b5bfae5 100644
--- a/src/libshared/machine-pool.c
+++ b/src/libshared/machine-pool.c
@@ -32,8 +32,8 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
-#include "sd-bus-protocol.h"
-#include "sd-bus.h"
+#include <systemd/sd-bus-protocol.h>
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/libshared/machine-pool.h b/src/libshared/machine-pool.h
index 40fe5ecb3a..fe99b7e0ae 100644
--- a/src/libshared/machine-pool.h
+++ b/src/libshared/machine-pool.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 /* Grow the /var/lib/machines directory after each 10MiB written */
 #define GROW_INTERVAL_BYTES (UINT64_C(10) * UINT64_C(1024) * UINT64_C(1024))
diff --git a/src/libshared/ptyfwd.c b/src/libshared/ptyfwd.c
index 061d31f4de..a97e0d5143 100644
--- a/src/libshared/ptyfwd.c
+++ b/src/libshared/ptyfwd.c
@@ -30,7 +30,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libshared/specifier.c b/src/libshared/specifier.c
index 1c17eb5251..303ddf0401 100644
--- a/src/libshared/specifier.c
+++ b/src/libshared/specifier.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sys/utsname.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "hostname-util.h"