Index: apps/plugins/doom/g_game.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/doom/g_game.c,v
retrieving revision 1.3
diff -u -r1.3 g_game.c
--- apps/plugins/doom/g_game.c	16 Apr 2006 23:14:04 -0000	1.3
+++ apps/plugins/doom/g_game.c	29 Aug 2006 21:18:32 -0000
@@ -2770,7 +2770,7 @@
       int endtime = I_GetTime ();
       // killough -- added fps information and made it work for longer demos:
       unsigned realtics = endtime-starttime;
-      int fd=open("/games/doom/timedemo.txt",O_WRONLY | O_CREAT);
+      int fd=open(GAMEBASE "timedemo.txt",O_WRONLY | O_CREAT);
       fprintf (fd,"Timed %d gametics in %d realtics = %d frames per second",
                (unsigned) gametic, realtics,
                (unsigned) gametic * (double) TICRATE / realtics);
Index: apps/plugins/doom/rockdoom.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/doom/rockdoom.c,v
retrieving revision 1.19
diff -u -r1.19 rockdoom.c
--- apps/plugins/doom/rockdoom.c	10 Jun 2006 18:47:11 -0000	1.19
+++ apps/plugins/doom/rockdoom.c	29 Aug 2006 21:18:32 -0000
@@ -206,7 +206,7 @@
    "TNT"
 };
 
-const unsigned char wads_builtin[7][30] =
+const unsigned char wads_builtin[7][40] =
 {
    GAMEBASE"doom1.wad",
    GAMEBASE"doom.wad",
Index: apps/plugins/doom/rockmacros.h
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/doom/rockmacros.h,v
retrieving revision 1.5
diff -u -r1.5 rockmacros.h
--- apps/plugins/doom/rockmacros.h	15 Apr 2006 22:08:36 -0000	1.5
+++ apps/plugins/doom/rockmacros.h	29 Aug 2006 21:18:32 -0000
@@ -87,7 +87,7 @@
 inline void* memcpy(void* dst, const void* src, size_t size);
 
 #define PACKEDATTR __attribute__((packed)) // Needed for a few things
-#define GAMEBASE "/games/doom/"
+#define GAMEBASE ROCKBOX_DIR "/gamedata/doom/"
 //#define SIMPLECHECKS
 #define NO_PREDEFINED_LUMPS
 #define TABLES_AS_LUMPS // This frees up alot of space in the plugin buffer
Index: apps/plugins/pacbox/pacbox.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/pacbox/pacbox.c,v
retrieving revision 1.12
diff -u -r1.12 pacbox.c
--- apps/plugins/pacbox/pacbox.c	11 Aug 2006 12:48:36 -0000	1.12
+++ apps/plugins/pacbox/pacbox.c	29 Aug 2006 21:18:33 -0000
@@ -74,7 +74,7 @@
 {
     char filename[MAX_PATH];
 
-    rb->snprintf(filename,sizeof(filename),"/.rockbox/pacman/%s",name);
+    rb->snprintf(filename,sizeof(filename),ROCKBOX_DIR "/gamedata/pacbox/%s",name);
 
     int fd = rb->open( filename, O_RDONLY);
 
@@ -437,7 +437,7 @@
                             SETTINGS_VERSION);
         }
     } else {
-        rb->splash(HZ*2,true,"No ROMs in /.rockbox/pacman/");
+        rb->splash(HZ*2,true,"No ROMs in " ROCKBOX_DIR "/gamedata/pacbox/");
     }
 
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ