summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-07-23 22:12:23 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-07-23 23:05:21 -0400
commit0d4bb8b94e37e73f5c163eab267865824e8f912f (patch)
tree21f8bf6781eb44c0254abcdaafdcee1c060847d3
parentf28b95a3f9c991c584025b033ea94a14ed113b95 (diff)
fixity
-rw-r--r--build-aux/Makefile.each.tail/20-systemd.mk15
-rw-r--r--src/Makefile9
l---------src/grp-udev/libudev-core/logind-acl.c2
l---------src/grp-udev/libudev-core/logind-acl.h2
4 files changed, 16 insertions, 12 deletions
diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index dfb8fa5b06..8b84b52b63 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -52,8 +52,21 @@ $(addprefix $(outdir)/,$(foreach d,$(am.bindirs),$($d_PROGRAMS))): $(outdir)/%:
@if test $(words $^) = 0; then echo 'Cannot link executable with no dependencies: $@' >&2; exit 1; fi
$(AM_V_CCLD)$(LINK) $(_systemd.link_files)
+$(DESTDIR)$(bindir)/%: $(outdir)/%
+ $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(rootbindir)/%: $(outdir)/%
+ $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(libexecdir)/%: $(outdir)/%
+ $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(rootlibexecdir)/%: $(outdir)/%
+ $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(systemgeneratordir)/%: $(outdir)/%
+ $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(udevlibexecdir)/%: $(outdir)/%
+ $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
+
$(DESTDIR)$(libdir)/%.la: $(outdir)/%.la
- $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $< $(@D)
+ $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
$(outdir)/%-from-name.gperf: $(outdir)/%-list.txt
$(AM_V_at)$(MKDIR_P) $(dir $@)
diff --git a/src/Makefile b/src/Makefile
index 2048196700..5da6a48833 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -51,8 +51,6 @@ at.subdirs += systemd-activate
at.subdirs += systemd-ac-power
at.subdirs += systemd-analyze
at.subdirs += systemd-ask-password
-at.subdirs += systemd-backlight
-at.subdirs += systemd-binfmt
at.subdirs += systemd-cgls
at.subdirs += systemd-cgroups-agent
at.subdirs += systemd-cgtop
@@ -60,7 +58,6 @@ at.subdirs += systemd-cryptsetup
at.subdirs += systemd-dbus1-generator
at.subdirs += systemd-debug-generator
at.subdirs += systemd-delta
-at.subdirs += systemd-detect-virt
at.subdirs += systemd-escape
at.subdirs += systemd-firstboot
at.subdirs += systemd-fsck
@@ -75,15 +72,11 @@ at.subdirs += systemd-modules-load
at.subdirs += systemd-notify
at.subdirs += systemd-nspawn
at.subdirs += systemd-path
-at.subdirs += systemd-quotacheck
-at.subdirs += systemd-random-seed
at.subdirs += systemd-rc-local-generator
at.subdirs += systemd-remount-fs
at.subdirs += systemd-reply-password
-at.subdirs += systemd-rfkill
at.subdirs += systemd-run
at.subdirs += systemd-shutdown
-at.subdirs += systemd-sleep
at.subdirs += systemd-socket-proxyd
at.subdirs += systemd-stdio-bridge
at.subdirs += systemd-sysctl
@@ -95,7 +88,5 @@ at.subdirs += systemd-tmpfiles
at.subdirs += systemd-tty-ask-password-agent
at.subdirs += systemd-update-done
at.subdirs += systemd-update-utmp
-at.subdirs += systemd-user-sessions
-at.subdirs += systemd-vconsole
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/logind-acl.c b/src/grp-udev/libudev-core/logind-acl.c
index d554c77128..9dd626440f 120000
--- a/src/grp-udev/libudev-core/logind-acl.c
+++ b/src/grp-udev/libudev-core/logind-acl.c
@@ -1 +1 @@
-../../grp-login/logind-acl.c \ No newline at end of file
+../../grp-login/liblogind-core/logind-acl.c \ No newline at end of file
diff --git a/src/grp-udev/libudev-core/logind-acl.h b/src/grp-udev/libudev-core/logind-acl.h
index 0355fa2378..60f96cbe0a 120000
--- a/src/grp-udev/libudev-core/logind-acl.h
+++ b/src/grp-udev/libudev-core/logind-acl.h
@@ -1 +1 @@
-../../grp-login/logind-acl.h \ No newline at end of file
+../../grp-login/liblogind-core/logind-acl.h \ No newline at end of file