Only remove backup files as part of "make uninstall" when INSTALL_BACKUP

is set.

diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in
index 59a581bed54c33dfe854f1ad5018e191f5dd982d..a241e63ed1accbf6e824d46df0f422ed9deeea5e 100644 (file)
--- a/lib/util/Makefile.in
+++ b/lib/util/Makefile.in
@@ -229,6 +229,8 @@ install-plugin:
 
 uninstall:
        $(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(libexecdir)/sudo/libsudo_util.la
+       -test -z "$(INSTALL_BACKUP)" || \
+           rf -f $(DESTDIR)$(libexecdir)/sudo/libsudo_util.*~
 
 splint:
        splint $(SPLINT_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c

diff --git a/lib/zlib/Makefile.in b/lib/zlib/Makefile.in
index 22f6601d65821b9140e39709434f7af34a4907c0..1557a65fb59451a6fbe7c1153db5b3e3b54b9910 100644 (file)
--- a/lib/zlib/Makefile.in
+++ b/lib/zlib/Makefile.in
@@ -134,6 +134,8 @@ install-plugin:
 
 uninstall:
        $(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(libexecdir)/sudo/libsudo_z.la
+       -test -z "$(INSTALL_BACKUP)" || \
+           rf -f $(DESTDIR)$(libexecdir)/sudo/libsudo_z.*~
 
 splint:
 

diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in
index fddb90e803bb446dc3b3db4d957317d9ad763d66..24a34ae1583a4fbdc9a1a6f39a6f4c061a20eeeb 100644 (file)
--- a/plugins/group_file/Makefile.in
+++ b/plugins/group_file/Makefile.in
@@ -139,7 +139,8 @@ install-plugin: install-dirs group_file.la
 
 uninstall:
        -$(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/group_file.la
-       -rm -f $(DESTDIR)$(plugindir)/group_file.so~
+       -test -z "$(INSTALL_BACKUP)" || \
+           rm -f $(DESTDIR)$(plugindir)/group_file.so$(INSTALL_BACKUP)
 
 splint:
        splint $(SPLINT_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c

diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
index 4230bd6968df609135df42fee42e3a9df3453f7c..e5bcad3fc79ae8ce9f9c53e042b8957de6952dd5 100644 (file)
--- a/plugins/sample/Makefile.in
+++ b/plugins/sample/Makefile.in
@@ -138,7 +138,8 @@ install-plugin: install-dirs sample_plugin.la
 
 uninstall:
        -$(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sample_plugin.la
-       -rm -f $(DESTDIR)$(plugindir)/sample_plugin.so~
+       -test -z "$(INSTALL_BACKUP)" || \
+           rm -f $(DESTDIR)$(plugindir)/sample_plugin.so$(INSTALL_BACKUP)
 
 splint:
        splint $(SPLINT_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 7f2c96e2cc02820b8091e9ce56d26c1e9e91ef61..6269656438cb71bae95a44d02ef134bf7cedd7f1 100644 (file)
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -345,10 +345,11 @@ install-sudoers: install-dirs
 uninstall:
        -$(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la
        -rm -f  $(DESTDIR)$(replaydir)/sudoreplay \
-               $(DESTDIR)$(replaydir)/sudoreplay~ \
-               $(DESTDIR)$(visudodir)/visudo \
-               $(DESTDIR)$(visudodir)/visudo~ \
-               $(DESTDIR)$(plugindir)/sudoers.so~
+               $(DESTDIR)$(visudodir)/visudo
+       -test -z "$(INSTALL_BACKUP)" || \
+               $(DESTDIR)$(replaydir)/sudoreplay$(INSTALL_BACKUP) \
+               $(DESTDIR)$(visudodir)/visudo$(INSTALL_BACKUP) \
+               $(DESTDIR)$(plugindir)/sudoers.so$(INSTALL_BACKUP)
        -cmp $(DESTDIR)$(sudoersdir)/sudoers $(srcdir)/sudoers >/dev/null && \
            rm -f $(DESTDIR)$(sudoersdir)/sudoers
 

diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in
index 1635d3b4274fe1ca83d93974e91daebc4f80852d..141aede5c97e309080055350302f479e37a2b872 100644 (file)
--- a/plugins/system_group/Makefile.in
+++ b/plugins/system_group/Makefile.in
@@ -139,7 +139,8 @@ install-plugin: install-dirs system_group.la
 
 uninstall:
        -$(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/system_group.la
-       -rm -f $(DESTDIR)$(plugindir)/system_group.so~
+       -test -z "$(INSTALL_BACKUP)" || \
+           rm -f $(DESTDIR)$(plugindir)/system_group.so$(INSTALL_BACKUP)
 
 splint:
        splint $(SPLINT_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c

diff --git a/src/Makefile.in b/src/Makefile.in
index 8f2c4586066b1589ad44f7f0502c12ee1ff6e185..cc92943fc721b7622b0d802bd52dd703ff321910 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -194,13 +194,14 @@ install-plugin:
 uninstall:
        -$(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(noexecdir)/sudo_noexec.la
        -rm -f  $(DESTDIR)$(bindir)/sudo \
-               $(DESTDIR)$(bindir)/sudo~ \
                $(DESTDIR)$(bindir)/sudoedit \
                $(DESTDIR)$(libexecdir)/sudo/sesh \
-               $(DESTDIR)$(libexecdir)/sudo/sesh~ \
-               $(DESTDIR)$(noexecdir)/sudo_noexec.so~ \
                $(DESTDIR)/usr/lib/tmpfiles.d/sudo.conf
-       -test -n "$(INIT_SCRIPT)" && \
+       -test -z "$(INSTALL_BACKUP)" || \
+           rm -f $(DESTDIR)$(bindir)/sudo$(INSTALL_BACKUP) \
+                 $(DESTDIR)$(libexecdir)/sudo/sesh$(INSTALL_BACKUP) \
+                 $(DESTDIR)$(noexecdir)/sudo_noexec.so$(INSTALL_BACKUP)
+       -test -z "$(INIT_SCRIPT)" || \
            rm -f $(DESTDIR)$(RC_LINK) $(DESTDIR)$(INIT_DIR)/sudo
 
 splint: