summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-07 03:28:15 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-07 03:28:15 -0400
commitc97d04c6f98646f4ffef185ed96f552c986da664 (patch)
treec9d2498e1af904683238b1a120879fe9f690e5e7
parent1695727ec85c18e7a31fa824d68bb59704ddacd7 (diff)
fewer differences
-rw-r--r--Makefile.am8
-rwxr-xr-xmove.sh3
2 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 0e67fd7ef8..c6fa3434c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6546,10 +6546,18 @@ list-keys:
add-key:
gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -
+#@src/Makefile
+
#@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
#@all
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/move.sh b/move.sh
index 99f935b627..6430e981b6 100755
--- a/move.sh
+++ b/move.sh
@@ -241,6 +241,9 @@ fixup_makefiles() (
src/libbasic/Makefile \
src/libsystemd/libsystemd-journal-internal/Makefile \
src/udev/Makefile
+ find -type f -name Makefile|while read -r filename; do
+ sed -r -i "s|(/\.\.)*/config.mk|$(realpath -ms --relative-to="${filename#%/*}" config.mk)|" "$filename"
+ done
)
move() (