From 3cad0b87dc55f8eab9b00cd3aa01e817b39a5d62 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 13 Mar 2006 02:05:39 +0000 Subject: r14281: Pull apart LIBDIR and MODULESDIR Move architecture-independent data to DATADIR (was LIBDIR) (This used to be commit 2c7b62a861f702067e8df4c3239ac7e377631a15) --- source4/lib/util/util.c | 6 +++--- source4/lib/util/util_unistr.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/lib/util') diff --git a/source4/lib/util/util.c b/source4/lib/util/util.c index ec25a9cbc7..a0890d5ba9 100644 --- a/source4/lib/util/util.c +++ b/source4/lib/util/util.c @@ -637,15 +637,15 @@ static char *pid_path(TALLOC_CTX* mem_ctx, const char *name) /** * @brief Returns an absolute path to a file in the Samba lib directory. * - * @param name File to find, relative to LIBDIR. + * @param name File to find, relative to DATADIR. * * @retval Pointer to a talloc'ed string containing the full path. **/ -_PUBLIC_ char *lib_path(TALLOC_CTX* mem_ctx, const char *name) +_PUBLIC_ char *data_path(TALLOC_CTX* mem_ctx, const char *name) { char *fname; - fname = talloc_asprintf(mem_ctx, "%s/%s", dyn_LIBDIR, name); + fname = talloc_asprintf(mem_ctx, "%s/%s", dyn_DATADIR, name); return fname; } diff --git a/source4/lib/util/util_unistr.c b/source4/lib/util/util_unistr.c index 81aa0d6752..b951ea51ad 100644 --- a/source4/lib/util/util_unistr.c +++ b/source4/lib/util/util_unistr.c @@ -44,8 +44,8 @@ static void load_case_tables(void) if (!mem_ctx) { smb_panic("No memory for case_tables"); } - upcase_table = map_file(lib_path(mem_ctx, "upcase.dat"), 0x20000); - lowcase_table = map_file(lib_path(mem_ctx, "lowcase.dat"), 0x20000); + upcase_table = map_file(data_path(mem_ctx, "upcase.dat"), 0x20000); + lowcase_table = map_file(data_path(mem_ctx, "lowcase.dat"), 0x20000); talloc_free(mem_ctx); if (upcase_table == NULL) { /* try also under codepages for testing purposes */ -- cgit