From acd190019d99fe25abf4515ca1834eb277161833 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 7 Jun 2016 03:42:06 -0400 Subject: fewer differences --- Makefile.am | 6 ++++++ move.sh | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) 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() ( -- cgit v1.2.3-54-g00ecf