Move VG_(libdir) into m_libcproc.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3901 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_libcproc.c b/coregrind/m_libcproc.c
index 06a1dc7..5c551fd 100644
--- a/coregrind/m_libcproc.c
+++ b/coregrind/m_libcproc.c
@@ -46,6 +46,9 @@
Char** VG_(client_argv);
Char** VG_(client_envp);
+/* Path to library directory */
+const Char *VG_(libdir) = VG_LIBDIR;
+
/* We do getenv without libc's help by snooping around in
VG_(client_envp) as determined at startup time. */
Char *VG_(getenv)(Char *varname)
diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 3201c88..e85addc 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -118,9 +118,6 @@
/* client executable */
Int VG_(clexecfd) = -1;
-/* Path to library directory */
-const Char *VG_(libdir) = VG_LIBDIR;
-
/* our argc/argv */
static Int vg_argc;
static Char **vg_argv;
diff --git a/include/pub_tool_libcproc.h b/include/pub_tool_libcproc.h
index 6776b2b..e8588f5 100644
--- a/include/pub_tool_libcproc.h
+++ b/include/pub_tool_libcproc.h
@@ -43,6 +43,9 @@
/* Looks up VG_(client_envp) */
extern Char* VG_(getenv) ( Char* name );
+/* Path to all our library/aux files */
+extern const Char *VG_(libdir);
+
/* ---------------------------------------------------------------------
Important syscalls
------------------------------------------------------------------ */
diff --git a/include/tool.h b/include/tool.h
index 6fcb90d..fcdb1c0 100644
--- a/include/tool.h
+++ b/include/tool.h
@@ -52,14 +52,6 @@
programs do not need many threads. */
#define VG_N_THREADS 100
-
-/*====================================================================*/
-/*=== Useful macros ===*/
-/*====================================================================*/
-
-/* Path to all our library/aux files */
-extern const Char *VG_(libdir);
-
/*====================================================================*/
/*=== Useful stuff to call from generated code ===*/
/*====================================================================*/