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.

diff --git a/ChangeLog b/ChangeLog
index db22b6ad6e32c1affeee088b4785f6d29b7b13fe..a76f722e080366ca49563d0985904bc70a9e3c50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-22  Ben Pfaff  <blp@cs.stanford.edu>
+
+       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-21  Bruno Haible  <bruno@clisp.org>
 
        Update for NetBSD 5.0.

diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index b96892952e0b5e0057d93cd4e37deed30bf44fd7..e938a69a570da0e287ebbb1ab172e1ca18757930 100644 (file)
--- 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: