From ddd35459c325d14c90f6334fa09fb826adc5be29 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Fri, 24 Jul 2015 13:38:03 -0600 Subject: [PATCH] The init.d files are generated from a .in file so we need to install from top_builddir not top_srcdir. From Ross Burton. Bug #708 --- doc/CONTRIBUTORS | 1 + src/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS index 68a2b07d4..4717e027b 100644 --- a/doc/CONTRIBUTORS +++ b/doc/CONTRIBUTORS @@ -25,6 +25,7 @@ you believe you should be listed, please send a note to sudo@sudo.ws. Brooks, Piete Brown, Jerry Burr, Michael E + Burton, Ross Bussjaeger, Andreas Calvin, Gary Campbell, Aaron diff --git a/src/Makefile.in b/src/Makefile.in index f009e10e4..7acfb2dc0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -165,11 +165,11 @@ install-dirs: install-rc: install-dirs if [ -n "$(INIT_SCRIPT)" ]; then \ - $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ + $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_builddir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ rm -f $(DESTDIR)$(RC_LINK); \ ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \ elif test -n "$(tmpfiles_d)"; then \ - $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_srcdir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \ + $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_builddir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \ fi install-binaries: install-dirs $(PROGS) -- 2.40.0