From cc0adb39265accc2753be3e1aa55087d19f71286 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 19 Dec 2010 11:59:10 +0100
Subject: [PATCH] relocatable-prog-wrapper: Separate from relocatable-prog.

* modules/relocatable-prog (Makefile.am): Define uninstall-hook and
uninstall-relocwrapper rule here.
* modules/relocatable-prog-wrapper (Makefile.am): ... not here.
Reported by Ian Beckwith <ianb@erislabs.net>.
---
 ChangeLog                        |  8 ++++++++
 modules/relocatable-prog         | 14 ++++++++++++++
 modules/relocatable-prog-wrapper | 14 --------------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 171f8b651..516e7d9b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-19  Bruno Haible  <bruno@clisp.org>
 
+	relocatable-prog-wrapper: Separate from relocatable-prog.
+	* modules/relocatable-prog (Makefile.am): Define uninstall-hook and
+	uninstall-relocwrapper rule here.
+	* modules/relocatable-prog-wrapper (Makefile.am): ... not here.
+	Reported by Ian Beckwith <ianb@erislabs.net>.
+
+2010-12-19  Bruno Haible  <bruno@clisp.org>
+
 	unistr/u8-mbsnlen: Add missing dependency.
 	* modules/unistr/u8-mbsnlen (Depends-on): Add unistr/u8-mbtouc.
 	Reported by Ian Beckwith <ianb@erislabs.net>.
diff --git a/modules/relocatable-prog b/modules/relocatable-prog
index 48a66b8bc..129947f2b 100644
--- a/modules/relocatable-prog
+++ b/modules/relocatable-prog
@@ -29,6 +29,20 @@ gl_RELOCATABLE([$gl_source_base])
 
 Makefile.am:
 DEFS += -DEXEEXT=\"@EXEEXT@\"
+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:
 "relocatable.h"
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index e938a69a5..b96892952 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -53,20 +53,6 @@ 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:
 
-- 
2.11.0