Re: uninstalling relocation wrappers

[Ben Pfaff]

I finally got around to testing the final version of the fix.  It
works fine.  Thanks to everyone for advice.

Here's the final version of the patch for review.

Thanks,

Ben.

--8<--------------------------cut here-------------------------->8--

From: Ben Pfaff <address@hidden>
Date: Sat, 13 Nov 2010 21:05:46 -0800
Subject: [PATCH] Uninstall ".bin" files installed by relocwrapper.

* modules/relocatable-prog-wrapper (uninstall-relocwrapper):
Recursively run "make uninstall" with ".bin" prefixed to EXEEXT,
unless it is already there.
---
 ChangeLog                        |    7 +++++++
 modules/relocatable-prog-wrapper |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e2bd35c..095f9f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-09  Ben Pfaff  <address@hidden>
+
+       Uninstall ".bin" files installed by relocwrapper.
+       * modules/relocatable-prog-wrapper (uninstall-relocwrapper):
+       Recursively run "make uninstall" with ".bin" prefixed to EXEEXT,
+       unless it is already there.
+
 2010-11-13  Bruno Haible  <address@hidden>
 
        rename test: Add comments.
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index b968929..e938a69 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -53,6 +53,20 @@ gl_FUNC_SETENV_SEPARATE
 gl_FUNC_STRERROR_SEPARATE
 
 Makefile.am:
+if RELOCATABLE_VIA_WRAPPER
+uninstall-hook: uninstall-relocwrapper
+uninstall-relocwrapper:
+       if test $(RELOCATABLE) = yes; then \
+         case '$(EXEEXT)' in \
+           .bin*) ;; \
+           *) cd $(top_builddir) && \
+              $(MAKE) $(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT) \
+                      AM_MAKEFLAGS='$(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT)' \
+                      uninstall ;; \
+         esac; \
+       fi
+.PHONY: uninstall-relocwrapper
+endif
 
 Include:
 
-- 
Ben Pfaff 
http://benpfaff.org