os/sysbits.c

This commit is contained in:
Vitor Santos Costa 2016-05-19 13:35:22 +01:00
parent a5bb2e226c
commit d00698b76a

View File

@ -1323,18 +1323,18 @@ const char *Yap_findFile(const char *isource, const char *idef,
case 5: // search from the binary case 5: // search from the binary
#ifndef __ANDROID__ #ifndef __ANDROID__
{
done = true; done = true;
break; } break;
#endif #endif
{
const char *pt = Yap_FindExecutable(); const char *pt = Yap_FindExecutable();
if (pt) { if (pt) {
if (ftype == YAP_BOOT_PL) { if (ftype == YAP_BOOT_PL) {
root = "../../share/Yap/pl"; root = "../../share/Yap/pl";
} else { } else {
root = root = (ftype == YAP_SAVED_STATE || ftype == YAP_OBJ
(ftype == YAP_SAVED_STATE
|| ftype == YAP_OBJ
? "../../lib/Yap" ? "../../lib/Yap"
: "../../share/Yap"); : "../../share/Yap");
} }
@ -1347,6 +1347,7 @@ const char *Yap_findFile(const char *isource, const char *idef,
done = true; done = true;
} }
source = (isource ? isource : idef); source = (isource ? isource : idef);
}
break; break;
case 6: // default, try current directory case 6: // default, try current directory
if (!isource && ftype == YAP_SAVED_STATE) if (!isource && ftype == YAP_SAVED_STATE)