X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Frelocatable-prog;h=72bc2537782d2c34b60cc5c735017a38fac253b3;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=62c0b31e9a5d8e40ee70f02ccfdf694ad7420772;hpb=991967044a1c38c88a7163d2a8169870416a88fc;p=gnulib.git

diff --git a/modules/relocatable-prog b/modules/relocatable-prog
index 62c0b31e9..72bc25377 100644
--- a/modules/relocatable-prog
+++ b/modules/relocatable-prog
@@ -26,13 +26,31 @@ strdup
 
 configure.ac:
 gl_RELOCATABLE([$gl_source_base])
+if test $RELOCATABLE = yes; then
+  AC_LIBOBJ([progreloc])
+  AC_LIBOBJ([relocatable])
+fi
 
 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:
-#include "relocatable.h"
-#include "progname.h"
+"relocatable.h"
+"progname.h"
 
 License:
 GPL