Support for running "make check" before "make install".

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index fb26f4fd33d2ffeddb724bb39f936edda7c90218..26c1c10a223db89e7ad7dd5ec8e6ec1167ae37f3 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-23  Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c (get_charset_aliases): Allow the CHARSETALIASDIR
+       environment variable to override LIBDIR.
+       Suggested by Matthias Clasen <mclasen@redhat.com>.
+
 2004-04-20  Jim Meyering  <jim@meyering.net>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index 82a4b191423f55464533d99c17080479b9c4103f..990420ba454ad2beebba708e271430f25c232a93 100644 (file)
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -116,10 +116,16 @@ get_charset_aliases ()
     {
 #if !(defined VMS || defined WIN32)
       FILE *fp;
-      const char *dir = relocate (LIBDIR);
+      const char *dir;
       const char *base = "charset.alias";
       char *file_name;
 
+      /* Make it possible to override the charset.alias location.  This is
+        necessary for running the testsuite before "make install".  */
+      dir = getenv ("CHARSETALIASDIR");
+      if (dir == NULL || dir[0] == '\0')
+       dir = relocate (LIBDIR);
+
       /* Concatenate dir and base into freshly allocated file_name.  */
       {
        size_t dir_len = strlen (dir);

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 7333cb92a58915f94c1aff14838036ac5c1b2aa6..dc70e484783f790f5660eb2955e636ee13ce8791 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-23  Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c (get_charset_aliases): Allow the CHARSETALIASDIR
+       environment variable to override LIBDIR.
+       Suggested by Matthias Clasen <mclasen@redhat.com>.
+
 2004-04-20  Jim Meyering  <jim@meyering.net>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-tools/lib/localcharset.c b/gettext-tools/lib/localcharset.c
index 82a4b191423f55464533d99c17080479b9c4103f..990420ba454ad2beebba708e271430f25c232a93 100644 (file)
--- a/gettext-tools/lib/localcharset.c
+++ b/gettext-tools/lib/localcharset.c
@@ -116,10 +116,16 @@ get_charset_aliases ()
     {
 #if !(defined VMS || defined WIN32)
       FILE *fp;
-      const char *dir = relocate (LIBDIR);
+      const char *dir;
       const char *base = "charset.alias";
       char *file_name;
 
+      /* Make it possible to override the charset.alias location.  This is
+        necessary for running the testsuite before "make install".  */
+      dir = getenv ("CHARSETALIASDIR");
+      if (dir == NULL || dir[0] == '\0')
+       dir = relocate (LIBDIR);
+
       /* Concatenate dir and base into freshly allocated file_name.  */
       {
        size_t dir_len = strlen (dir);