makefiles: Install PE fake dlls in the architecture-specific directory.

dlls/ntdll/loader.c

@@ -2669,12 +2669,6 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne
         status = open_dll_file( new_name, pwm, mapping, image_info, id );
         if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE;
         else if (status != STATUS_DLL_NOT_FOUND) goto done;
-        new_name->Length = len;
-        RtlAppendUnicodeToString( new_name, L"\\fakedlls\\" );
-        RtlAppendUnicodeToString( new_name, name );
-        status = open_dll_file( new_name, pwm, mapping, image_info, id );
-        if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE;
-        else if (status != STATUS_DLL_NOT_FOUND) goto done;
         RtlFreeUnicodeString( new_name );
     }
     if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH;

dlls/setupapi/fakedll.c

@@ -474,9 +474,6 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size )
         if ((res = read_file( ptr, &data, size ))) break;
         ptr = prepend( file + pos, path, lstrlenW(path) );
         if ((res = read_file( ptr, &data, size ))) break;
-        ptr = prepend( file + pos, L"\\fakedlls", 9 );
-        ptr = prepend( ptr, path, lstrlenW(path) );
-        if ((res = read_file( ptr, &data, size ))) break;
     }
 
 done:
@@ -1042,9 +1039,6 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B
         install_lib_dir( dest, file, wildcard, NULL, delete );
         lstrcpyW( file, path );
         install_lib_dir( dest, file, wildcard, NULL, delete );
-        lstrcpyW( file, path );
-        lstrcatW( file, L"\\fakedlls" );
-        install_lib_dir( dest, file, wildcard, NULL, delete );
     }
     HeapFree( GetProcessHeap(), 0, file );
     HeapFree( GetProcessHeap(), 0, dest );

tools/makedep.c

@@ -3315,7 +3315,7 @@ static void output_module( struct makefile *make )
         add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ),
                           strmake( "p$(dlldir)/%s%s", make->module, dll_ext ));
         add_install_rule( make, make->module, strmake( "%s.fake", make->module ),
-                          strmake( "d$(dlldir)/fakedlls/%s", make->module ));
+                          strmake( "d%s/%s", pe_dir, make->module ));
         output( "%s%s %s.fake:", module_path, dll_ext, module_path );
     }
     else