Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	src/Makefile
#	src/grp-boot/Makefile
#	src/grp-coredump/Makefile
#	src/grp-machine/Makefile
#	src/libsystemd/libsystemd-internal/subdir.mk
#	src/libudev/Makefile

7 files changed, 8 insertions, 8 deletions

diff --git a/src/udev/Makefile b/src/udev/Makefile
index 4e475a5727..8449d56635 100644
--- a/src/udev/Makefile
+++ b/src/udev/Makefile
@@ -86,10 +86,10 @@ noinst_LTLIBRARIES += \
 $(outdir)/keyboard-keys-list.txt:
 	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
 
-$(outdir)/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
+$(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
 
-$(outdir)/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
+$(outdir)/keyboard-keys-from-name.h: $(outdir)/keyboard-keys-from-name.gperf
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
 
 gperf_txt_sources += \
diff --git a/src/udev/ata_id/Makefile b/src/udev/ata_id/Makefile
index e70e2573bd..00a8c37ac2 100644
--- a/src/udev/ata_id/Makefile
+++ b/src/udev/ata_id/Makefile
@@ -20,7 +20,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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ata_id_SOURCES = \
diff --git a/src/udev/cdrom_id/Makefile b/src/udev/cdrom_id/Makefile
index f7583cfb70..a9297413d3 100644
--- a/src/udev/cdrom_id/Makefile
+++ b/src/udev/cdrom_id/Makefile
@@ -20,7 +20,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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 cdrom_id_SOURCES = \
diff --git a/src/udev/collect/Makefile b/src/udev/collect/Makefile
index 88dbaa1d82..60af3b7627 100644
--- a/src/udev/collect/Makefile
+++ b/src/udev/collect/Makefile
@@ -20,7 +20,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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 collect_SOURCES = \
diff --git a/src/udev/mtd_probe/Makefile b/src/udev/mtd_probe/Makefile
index 719993ed0f..d7392a8a3b 100644
--- a/src/udev/mtd_probe/Makefile
+++ b/src/udev/mtd_probe/Makefile
@@ -20,7 +20,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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 mtd_probe_SOURCES =  \
diff --git a/src/udev/scsi_id/Makefile b/src/udev/scsi_id/Makefile
index eaf5a51734..7064a864f7 100644
--- a/src/udev/scsi_id/Makefile
+++ b/src/udev/scsi_id/Makefile
@@ -20,7 +20,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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 scsi_id_SOURCES =\
diff --git a/src/udev/v4l_id/Makefile b/src/udev/v4l_id/Makefile
index c2815b6809..0641af8065 100644
--- a/src/udev/v4l_id/Makefile
+++ b/src/udev/v4l_id/Makefile
@@ -20,7 +20,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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 v4l_id_SOURCES = \