Merge branch 'lukeshu/postmove' into lukeshu/master

6 files changed, 15 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index c6fa3434c3..9a749f4c1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6550,14 +6550,20 @@ add-key:
 
 #@src/libudev/Makefile
 at.subdirs += src
+
 #@src/libsystemd/libsystemd-internal/subdir.mk
 systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\"
 systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
 #@src/grp-boot/Makefile
 at.subdirs += bootctl systemd-boot
+
 #@src/grp-coredump/Makefile
 at.subdirs += coredumpctl systemd-coredump
+
 #@src/grp-machine/Makefile
 at.subdirs += machinectl systemd-machined
+at.subdirs += nss-mymachines
+
 #@all
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/move.sh b/move.sh
index 869d315811..22caeb8a6f 100755
--- a/move.sh
+++ b/move.sh
@@ -228,7 +228,8 @@ fixup_makefile() {
 	    -e 's|^if (.*)|ifneq ($(\1),)|' \
 	    -e 's|rootprefix|prefix|g' \
 	    -e 's|rootbin|bin|g' \
-	    -e 's|rootlib|lib|g'
+	    -e 's|rootlib|lib|g' \
+	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
 }
 
 fixup_makefiles() (
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile
index fd27ed7409..4e34240a43 100644
--- a/src/grp-resolve/systemd-resolved/Makefile
+++ b/src/grp-resolve/systemd-resolved/Makefile
@@ -126,7 +126,7 @@ libnss_resolve_la_LDFLAGS = \
 	-avoid-version \
 	-shared \
 	-shrext .so.2 \
-	-Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
+	-Wl,--version-script=$(srcdir)/nss-resolve.sym
 
 libnss_resolve_la_LIBADD = \
 	libsystemd-internal.la \
diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile
index d0ed978072..9d528431f4 100644
--- a/src/libsystemd/compat-libs/Makefile
+++ b/src/libsystemd/compat-libs/Makefile
@@ -47,7 +47,7 @@ libsystemd_journal_la_CPPFLAGS = \
 libsystemd_journal_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-	-Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
+	-Wl,--version-script=$(srcdir)/libsystemd-journal.sym
 
 libsystemd_journal_la_LIBADD = \
 	libsystemd-journal-internal.la \
@@ -66,7 +66,7 @@ libsystemd_login_la_CPPFLAGS = \
 libsystemd_login_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-	-Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym
+	-Wl,--version-script=$(srcdir)/libsystemd-login.sym
 
 libsystemd_login_la_LIBADD = \
 	libsystemd-internal.la
@@ -84,7 +84,7 @@ libsystemd_id128_la_CPPFLAGS = \
 libsystemd_id128_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-	-Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym
+	-Wl,--version-script=$(srcdir)/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
 	libsystemd-internal.la
@@ -102,7 +102,7 @@ libsystemd_daemon_la_CPPFLAGS = \
 libsystemd_daemon_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-	-Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
+	-Wl,--version-script=$(srcdir)/libsystemd-daemon.sym
 
 libsystemd_daemon_la_LIBADD = \
 	libsystemd-internal.la
diff --git a/src/login/Makefile b/src/login/Makefile
index 85c79a93b6..54353cbbbe 100644
--- a/src/login/Makefile
+++ b/src/login/Makefile
@@ -147,7 +147,7 @@ pam_systemd_la_LDFLAGS = \
 	-export-dynamic \
 	-avoid-version \
 	-shared \
-	-Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
+	-Wl,--version-script=$(srcdir)/pam_systemd.sym
 
 pam_systemd_la_LIBADD = \
 	libshared.la \
diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile
index 9af5aeabc2..b5f6ff62aa 100644
--- a/src/nss-myhostname/Makefile
+++ b/src/nss-myhostname/Makefile
@@ -35,7 +35,7 @@ libnss_myhostname_la_LDFLAGS = \
 	-avoid-version \
 	-shared \
 	-shrext .so.2 \
-	-Wl,--version-script=$(top_srcdir)/src/nss-myhostname/nss-myhostname.sym
+	-Wl,--version-script=$(srcdir)/nss-myhostname.sym
 
 libnss_myhostname_la_LIBADD = \
 	libsystemd-internal.la