Don't install libintl.la if the package shall be relocatable.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index ea811b85f041fcb3f4afc32b79a8f62c8985bd98..4c4a407c6186e0d14d114e9e4c9bff407766c687 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-06  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in (install-exec): Remove the installed libintl.la if it
+       has hardwired pathnames in dependency_libs and the installed package
+       shall be relocatable.
+
 2003-04-05  Bruno Haible  <bruno@clisp.org>
 
        * relocatable.c: Rely on DEPENDS_ON_LIBCHARSET, DEPENDS_ON_LIBICONV,

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 90321e86a948164b14244891c6e68e8278af4954..26bfdc840aab4e05b4ab4e0989b4aac892cbbbf2 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -246,6 +246,12 @@ install-exec: all
          $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
          $(LIBTOOL) --mode=install \
            $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+         if test "@RELOCATABLE@" = yes; then \
+           dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
+           if test -n "$dependencies"; then \
+             rm -f $(DESTDIR)$(libdir)/libintl.la; \
+           fi; \
+         fi; \
        else \
          : ; \
        fi