#define OSDIR to "beos" and use it, so we can later just change that

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10164 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2004-11-22 09:23:54 +00:00
parent d457be4f45
commit 722a8c5d4d
+25 -18
View File
@@ -20,6 +20,11 @@
/* use pwents to find home */ /* use pwents to find home */
#define USE_PWENTS #define USE_PWENTS
/* os root dir; just stick to 'beos' for now */
#define OSDIR "beos"
//#define OSDIR "haiku" // :)
//#define OSDIR "os"
#ifdef COMPILE_FOR_R5 #ifdef COMPILE_FOR_R5
#define USE_R5_SYSCALL_HACK #define USE_R5_SYSCALL_HACK
#undef USE_PWENTS #undef USE_PWENTS
@@ -35,26 +40,28 @@ extern status_t _kclosedir_(int dir);
#endif #endif
/* /bin/strings rox */ /* /bin/strings rox */
static const char *beos_dirs[] = { static const char *os_dirs[] = {
"beos", OSDIR,
"beos/system", OSDIR"/system",
"beos/system/add-ons", OSDIR"/system/add-ons",
"beos/system/boot", OSDIR"/system/boot",
"beos/etc/fonts", OSDIR"/etc/fonts",
"beos/system/lib", OSDIR"/system/lib",
"beos/system/servers", OSDIR"/system/servers",
"beos/apps", OSDIR"/apps",
"beos/bin", OSDIR"/bin",
"beos/etc", OSDIR"/etc",
"beos/documentation", OSDIR"/documentation",
"beos/preferences", OSDIR"/preferences",
"beos/system/add-ons/Translators", OSDIR"/system/add-ons/Translators",
"beos/system/add-ons/media", OSDIR"/system/add-ons/media",
"beos/etc/sounds", OSDIR"/etc/sounds",
}; };
/* R5 uses that, but it's *really* wrong, /* R5 uses that, but it's *really* wrong,
* we don't want "common" directories to depend on user's home ! */ * we don't want "common" directories to depend on user's home !
* it should actually be something else than /boot/home even...
*/
//#define HOME "$h" //#define HOME "$h"
#define HOME "home" #define HOME "home"
@@ -246,7 +253,7 @@ status_t find_directory (directory_which which, dev_t device, bool create_it, ch
case B_BEOS_TRANSLATORS_DIRECTORY: case B_BEOS_TRANSLATORS_DIRECTORY:
case B_BEOS_MEDIA_NODES_DIRECTORY: case B_BEOS_MEDIA_NODES_DIRECTORY:
case B_BEOS_SOUNDS_DIRECTORY: case B_BEOS_SOUNDS_DIRECTORY:
template = beos_dirs[which - B_BEOS_DIRECTORY]; template = os_dirs[which - B_BEOS_DIRECTORY];
break; break;
case B_COMMON_DIRECTORY: case B_COMMON_DIRECTORY:
case B_COMMON_SYSTEM_DIRECTORY: case B_COMMON_SYSTEM_DIRECTORY: