isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The init.d files are generated from a .in file so we need to install

Browse Source 
from top_builddir not top_srcdir.  From Ross Burton.  Bug #708
This commit is contained in:
Todd C. Miller
2015-07-24 13:38:03 -06:00
parent e941f97eb4
commit ddd35459c3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/CONTRIBUTORS
View File

@@ -25,6 +25,7 @@ you believe you should be listed, please send a note to sudo@sudo.ws.
Brooks, Piete Brooks, Piete
Brown, Jerry Brown, Jerry
Burr, Michael E Burr, Michael E
Burton, Ross
Bussjaeger, Andreas Bussjaeger, Andreas
Calvin, Gary Calvin, Gary
Campbell, Aaron Campbell, Aaron

4
src/Makefile.in
View File

@@ -165,11 +165,11 @@ install-dirs:
install-rc: install-dirs install-rc: install-dirs
if [ -n "$(INIT_SCRIPT)" ]; then \ 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); \ rm -f $(DESTDIR)$(RC_LINK); \
ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \ ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \
elif test -n "$(tmpfiles_d)"; then \ 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 fi
install-binaries: install-dirs $(PROGS) install-binaries: install-dirs $(PROGS)