Hi,
Ian Beckwith wrote:
> relocatable-prog-wrapper fails the test suite.
Indeed,
$ ./gnulib-tool --create-testdir ... relocatable-prog-wrapper
fails like this:
gllib/Makefile.am:148: RELOCATABLE_VIA_WRAPPER does not appear in
AM_CONDITIONAL
The problem is that RELOCATABLE_VIA_WRAPPER is defined in module
'relocatable-prog' but is used in 'relocatable-prog-wrapper'. Recall the
distinction of these two modules:
- 'relocatable-prog-wrapper' is just the source code for the wrapper program.
- 'relocatable-prog' additionally includes the macros and rules for
applying this wrapper to existing programs.
The right fix is therefore this one:
2010-12-19 Bruno Haible <br...@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 <i...@erislabs.net>.
--- modules/relocatable-prog.orig Sun Dec 19 11:56:01 2010
+++ modules/relocatable-prog Sun Dec 19 11:51:09 2010
@@ -29,6 +29,20 @@
Makefile.am:
DEFS += -DEXEEXT=\"@exe...@\"
+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"
--- modules/relocatable-prog-wrapper.orig Sun Dec 19 11:56:01 2010
+++ modules/relocatable-prog-wrapper Sun Dec 19 11:51:20 2010
@@ -53,20 +53,6 @@
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:
