iconv: Make it possible again to use this module without 'iconv-h'.

[gnulib.git] / modules / relocatable-prog-wrapper

diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index 247d3dd..e938a69 100644 (file)
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -8,26 +8,23 @@ lib/relocwrapper.c
 lib/progname.h
 lib/progname.c
 lib/progreloc.c
-lib/xreadlink.h
-lib/xreadlink.c
-lib/readlink.h
+lib/areadlink.h
+lib/areadlink.c
 lib/readlink.c
-lib/canonicalize.h
 lib/canonicalize-lgpl.c
-lib/allocsa.h
-lib/allocsa.c
+lib/malloca.h
+lib/malloca.c
 lib/relocatable.h
 lib/relocatable.c
-lib/setenv.h
 lib/setenv.c
 lib/strerror.c
 lib/c-ctype.h
 lib/c-ctype.c
-m4/allocsa.m4
-m4/canonicalize-lgpl.m4
+m4/malloca.m4
+m4/canonicalize.m4
 m4/eealloc.m4
+m4/environ.m4
 m4/longlong.m4
-m4/longdouble.m4
 m4/readlink.m4
 m4/relocatable-lib.m4
 m4/setenv.m4
@@ -35,20 +32,41 @@ m4/strerror.m4
 
 Depends-on:
 alloca-opt
+double-slash-root
+errno
 pathmax
 ssize_t
 stdbool
+stdlib
 unistd
+environ
+intprops
+string
+verify
 
 configure.ac:
 gl_FUNC_READLINK_SEPARATE
 gl_CANONICALIZE_LGPL_SEPARATE
-gl_ALLOCSA
-gl_RELOCATABLE_LIBRARY
+gl_MALLOCA
+gl_RELOCATABLE_LIBRARY_SEPARATE
 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: