2 files changed, 3 insertions, 34 deletions

diff --git a/tools/configure b/tools/configure
index 64b238bb6d..1f758a967d 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4270,7 +4270,7 @@ fi
       simcc "database-sdl"
       toolset='';
       appsdir='$(ROOTDIR)/tools/database';
-      rbdir="./.rockbox"
+
       case $uname in
           CYGWIN*|MINGW*)
               output="database_${modelname}.exe"
diff --git a/tools/database/database.c b/tools/database/database.c
index 713d379c41..6eab245f65 100644
--- a/tools/database/database.c
+++ b/tools/database/database.c
@@ -23,41 +23,10 @@ int main(int argc, char **argv)
 
     /* / is actually ., will get translated in io.c
      * (with the help of sim_root_dir below */
-    const char *paths[] = { "./", NULL };
+    const char *paths[] = { "/", NULL };
     tagcache_init();
     do_tagcache_build(paths);
     tagcache_reverse_scan();
-    
+
     return 0;
 }
-
-/* needed for io.c */
-const char *sim_root_dir = ".";
-
-/* stubs to avoid including thread-sdl.c */
-#include "kernel.h"
-void mutex_init(struct mutex *m)
-{
-    (void)m;
-}   
-
-void mutex_lock(struct mutex *m)
-{
-    (void)m;
-}   
-
-void mutex_unlock(struct mutex *m)
-{
-    (void)m;
-}   
-
-void sim_thread_lock(void *me)
-{
-    (void)me;
-}   
-
-void * sim_thread_unlock(void)
-{
-    return (void*)1;
-}   
-