From 092a6935e138946e040626c858f7cac929719264 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" <Todd.Miller@courtesan.com> Date: Fri, 23 Jul 2010 11:23:53 -0400 Subject: [PATCH] Install binary files with -b~ to make a backup. Fixes "text file busy" error on HP-UX during install. --- plugins/sample/Makefile.in | 2 +- plugins/sample_group/Makefile.in | 2 +- plugins/sudoers/Makefile.in | 6 +++--- src/Makefile.in | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index 9c7db343e..cd90db708 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -97,7 +97,7 @@ install-includes: install-doc: install-plugin: install-dirs sample_plugin.la - $(LIBTOOL) --mode=install --quiet $(INSTALL) sample_plugin.la $(DESDTDIR)/$(plugindir) + $(LIBTOOL) --mode=install --quiet $(INSTALL) -b~ sample_plugin.la $(DESDTDIR)/$(plugindir) uninstall: -$(LIBTOOL) --mode=uninstall rm -f $(DESDTDIR)/$(plugindir)/sample_plugin.la diff --git a/plugins/sample_group/Makefile.in b/plugins/sample_group/Makefile.in index 54344ad78..883484271 100644 --- a/plugins/sample_group/Makefile.in +++ b/plugins/sample_group/Makefile.in @@ -99,7 +99,7 @@ install-includes: install-doc: install-plugin: install-dirs sample_group.la - $(LIBTOOL) --mode=install --quiet $(INSTALL) sample_group.la $(DESDTDIR)/$(plugindir) + $(LIBTOOL) --mode=install --quiet $(INSTALL) -b~ sample_group.la $(DESDTDIR)/$(plugindir) uninstall: -$(LIBTOOL) --mode=uninstall rm -f $(DESDTDIR)/$(plugindir)/sample_group.la diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 64f4dd321..1b69f08da 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -255,8 +255,8 @@ install-dirs: $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) install-binaries: visudo sudoreplay install-dirs - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo + $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay + $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo install-includes: @@ -264,7 +264,7 @@ install-doc: @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0555 $(srcdir)/sudoers2ldif $(DESTDIR)$(docdir) install-plugin: sudoers.la install-dirs - $(LIBTOOL) --mode=install --quiet $(INSTALL) sudoers.la $(DESTDIR)$(plugindir) + $(LIBTOOL) --mode=install --quiet $(INSTALL) -b~ sudoers.la $(DESTDIR)$(plugindir) install-sudoers: install-dirs $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \ diff --git a/src/Makefile.in b/src/Makefile.in index fe8a41bf4..224bd6e03 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -127,10 +127,10 @@ install-dirs: $(DESTDIR)$(noexecdir) install-binaries: install-dirs $(PROGS) - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(bindir)/sudo + $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(bindir)/sudo rm -f $(DESTDIR)$(bindir)/sudoedit ln $(DESTDIR)$(bindir)/sudo $(DESTDIR)$(bindir)/sudoedit - if [ -f sesh ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi + if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi install-doc: -- 2.40.0