Make --enable-relocatable work better.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 325d3375c4f5f35bfed5a728d538bc6345b6aae4..ec4fd88dd1cb51e06a887654a3259a8f68ae3294 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-26  Bruno Haible  <bruno@clisp.org>
+
+       * read-java.c (msgdomain_read_java): Relocate also the GETTEXTJAR
+       value.
+       * urlget.c (fetch): Likewise.
+
 2003-12-26  Bruno Haible  <bruno@clisp.org>
 
        * write-java.c (write_java_code): Emit a static method

diff --git a/gettext-tools/src/read-java.c b/gettext-tools/src/read-java.c
index b2c25d68392f254aef326a18ab9171afdb308604..68ec27e8a26a8980c08255913cdf671d233c3868 100644 (file)
--- a/gettext-tools/src/read-java.c
+++ b/gettext-tools/src/read-java.c
@@ -108,7 +108,7 @@ msgdomain_read_java (const char *resource_name, const char *locale_name)
      necessary for running the testsuite before "make install".  */
   gettextjar = getenv ("GETTEXTJAR");
   if (gettextjar == NULL || gettextjar[0] == '\0')
-    gettextjar = GETTEXTJAR;
+    gettextjar = relocate (GETTEXTJAR);
 
   /* Assign a default value to the resource name.  */
   if (resource_name == NULL)

diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index c7878268ac0821d8a3506a0edbf0f3cf95b256a9..0cdcef445bdaf2e8afb2cd12ba618b6b450b6879 100644 (file)
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -259,7 +259,7 @@ fetch (const char *url, const char *file)
        necessary for running the testsuite before "make install".  */
     gettextjar = getenv ("GETTEXTJAR");
     if (gettextjar == NULL || gettextjar[0] == '\0')
-      gettextjar = GETTEXTJAR;
+      gettextjar = relocate (GETTEXTJAR);
 
     /* Prepare arguments.  */
     args[0] = url;