diff --git a/src/utilities/install/install.cpp b/src/utilities/install/install.cpp index d31723fac2..3d0c002edf 100644 --- a/src/utilities/install/install.cpp +++ b/src/utilities/install/install.cpp @@ -96,7 +96,8 @@ USHORT CLIENT_install(const TEXT * rootdir, USHORT client, bool sw_force, // number that we intend to install to WinSysDir. TEXT fbdll[MAXPATHLEN]; lstrcpy(fbdll, rootdir); - lstrcat(fbdll, "\\bin\\"); +// lstrcat(fbdll, "\\bin\\"); + lstrcat(fbdll, "\\"); lstrcat(fbdll, FBCLIENT_NAME); DWORD newverMS = 0, newverLS = 0; @@ -325,7 +326,8 @@ USHORT CLIENT_remove(const TEXT * rootdir, USHORT client, bool sw_force, // number that we could have installed to WinSysDir. TEXT fbdll[MAXPATHLEN]; lstrcpy(fbdll, rootdir); - lstrcat(fbdll, "\\bin\\"); +// lstrcat(fbdll, "\\bin\\"); + lstrcat(fbdll, "\\"); lstrcat(fbdll, FBCLIENT_NAME); DWORD ourverMS = 0, ourverLS = 0; diff --git a/src/utilities/install/install_client.cpp b/src/utilities/install/install_client.cpp index 1b9b616144..34fe13103b 100644 --- a/src/utilities/install/install_client.cpp +++ b/src/utilities/install/install_client.cpp @@ -94,9 +94,11 @@ int CLIB_ROUTINE main( int argc, char **argv) TEXT* p = directory + len; do {--p;} while (*p != '\\'); +/* Instclient no longer strips the bin\\ part. This section can be removed after fb2.1.0 beta2 // Get to the previous '\' (this one should precede the supposed 'bin\\' part). // There is always an additional '\' OR a ':'. do {--p;} while (*p != '\\' && *p != ':'); +*/ *p = '\0'; const TEXT* const* const end = argv + argc;