bootdata/xtldr/CMakeLists.txt

@@ -1 +1 @@
-set_install_file(xtldr.ini efi/boot)
+set_install_file(xtldr.ini efi/boot/xtldr)

sdk/xtdk/bltypes.h

@@ -15,9 +15,9 @@
 
 
 /* XTLDR directories */
-#define XTBL_LOADER_DIRECTORY                                       L"\\EFI\\BOOT\\XTLDR\\"
-#define XTBL_MODULES_DIRECTORY                                      L"\\EFI\\BOOT\\XTLDR\\MODULES\\"
-#define XTBL_THEMES_DIRECTORY                                       L"\\EFI\\BOOT\\XTLDR\\THEMES\\"
+#define XTBL_LOADER_DIRECTORY_PATH                                  L"\\EFI\\BOOT\\XTLDR\\"
+#define XTBL_MODULES_DIRECTORY_PATH                                 L"\\EFI\\BOOT\\XTLDR\\MODULES\\"
+#define XTBL_THEMES_DIRECTORY_PATH                                  L"\\EFI\\BOOT\\XTLDR\\THEMES\\"
 
 /* EFI XT boot devices */
 #define XTBL_BOOT_DEVICE_UNKNOWN                                    0x00

xtldr2/config.c

@@ -121,7 +121,7 @@ BlpLoadConfiguration()
     RtlInitializeListHead(&BlpConfigSections);
 
     /* Read data from configuration file */
-    Status = BlpReadConfigFile(L"\\EFI\\BOOT\\", L"XTLDR.INI", &ConfigData);
+    Status = BlpReadConfigFile(XTBL_LOADER_DIRECTORY_PATH, L"XTLDR.INI", &ConfigData);
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to load configuration */