summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-07 03:42:06 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-07 03:42:06 -0400
commitacd190019d99fe25abf4515ca1834eb277161833 (patch)
treee31ea75ed49ee06763a3bc9c9562c2dbcea6890c
parent33b6f3d4fd073aed475c3df66101b1993907e5d1 (diff)
fewer differences
-rw-r--r--Makefile.am6
-rwxr-xr-xmove.sh3
2 files changed, 8 insertions, 1 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() (