Mercurial > hg > octave-kai > gnulib-hg
changeset 13940:40a6cefcc5c9
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>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 19 Dec 2010 11:59:10 +0100 |
| parents | bb671fbb31ca |
| children | 8a75c6738522 |
| files | ChangeLog modules/relocatable-prog modules/relocatable-prog-wrapper |
| diffstat | 3 files changed, 22 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +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.
--- a/modules/relocatable-prog +++ b/modules/relocatable-prog @@ -29,6 +29,20 @@ 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"
--- a/modules/relocatable-prog-wrapper +++ b/modules/relocatable-prog-wrapper @@ -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: