Update.

	* locale/programs/localedef.c: Implement --prefix option to allow
	writing in standard places of alternative install directories.

diff --git a/ChangeLog b/ChangeLog
index e95ebe995e9b42af9d9ef6c2136dd6b960d0a4ee..3417171de7bd5eb139e0b5573b3d053f471f8132 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-12  Ulrich Drepper  <drepper@redhat.com>
 
+       * locale/programs/localedef.c: Implement --prefix option to allow
+       writing in standard places of alternative install directories.
+
        * posix/regex.c (compile_range): Implement collation sequence
        handling for glibc.  Use simple character ordering otherwise and
        not strcoll.

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index b632cc4f1c6a0b142c76702d65e7ab97794914dc..719cfd3bb7516685b80116c9dad22fd0a15c8c5e 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -61,6 +61,9 @@ int oldstyle_tables;
 /* If not zero force output even if warning were issued.  */
 static int force_output;
 
+/* Prefix for output files.  */
+const char *output_prefix;
+
 /* Name of the character map file.  */
 static const char *charmap_file;
 
@@ -81,6 +84,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
 #define OPT_POSIX 1
 #define OPT_QUIET 2
 #define OPT_OLDSTYLE 3
+#define OPT_PREFIX 4
 
 /* Definitions of arguments for argp functions.  */
 static const struct argp_option options[] =
@@ -96,6 +100,7 @@ static const struct argp_option options[] =
   { "force", 'c', NULL, 0,
     N_("Create output even if warning messages were issued") },
   { "old-style", OPT_OLDSTYLE, NULL, 0, N_("Create old-style tables") },
+  { "prefix", OPT_PREFIX, "PATH", 0, N_("Optional output file prefix") },
   { "posix", OPT_POSIX, NULL, 0, N_("Be strictly POSIX conform") },
   { "quiet", OPT_QUIET, NULL, 0,
     N_("Suppress warnings and information messages") },
@@ -250,6 +255,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case OPT_OLDSTYLE:
       oldstyle_tables = 1;
       break;
+    case OPT_PREFIX:
+      output_prefix = arg;
+      break;
     case 'c':
       force_output = 1;
       break;
@@ -359,9 +367,11 @@ construct_output_path (char *path)
         the end of the function we need another byte for the trailing
         '/'.  */
       if (normal == NULL)
-       n = asprintf (&result, "%s/%s%c", LOCALEDIR, path, '\0');
+       n = asprintf (&result, "%s%s/%s%c",
+                     output_prefix ?: "", LOCALEDIR, path, '\0');
       else
-       n = asprintf (&result, "%s/%.*s%s%s%c", LOCALEDIR,
+       n = asprintf (&result, "%s%s/%.*s%s%s%c",
+                     output_prefix ?: "", LOCALEDIR,
                      (int) (startp - path), path, normal, endp, '\0');
 
       endp = result + n;

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index fa6ed6855c23e3520dbff77b5a0bad7ea39bb7e4..51b10428b98d79246ccd5e165e1372204ccb8be6 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-13  Ulrich Drepper  <drepper@redhat.com>
+
+       * Makefile (install-locales): Use --prefix option of localedef to
+       avoid providing complete path for output file.
+
 2000-08-03  Ulrich Drepper  <drepper@redhat.com>
 
        * locales/zh_TW: Updated.

diff --git a/localedata/Makefile b/localedata/Makefile
index 2f6300411955e61328598352d6a414e9ce2124a5..8bdbedfb9098dd94a9f1464e726fb4304272991b 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -188,7 +188,7 @@ install-locales:
           case $$locale in \#*) continue;; esac; \
           $(LOCALEDEF) -i locales/`echo $$locale | sed 's/\([^.]*\).*/\1/'` \
                        -c -f charmaps/$$charset \
-                       $(inst_localedir)/$$locale; \
+                       $(addprefix --prefix=,$(install_root)) $$locale; \
        done < SUPPORTED
 
 # The mbwc-tests need some environment setup to find the locale data files