diff --git a/install.m b/install.m index efe2627..7ca31e5 100755 --- a/install.m +++ b/install.m @@ -42,8 +42,9 @@ post_install (d); % Check if the user has run the make script -F = dir (inst_dir); -if (all (arrayfun (@(name) ismember (sprintf ('%s.%s', name{:}, mexext),{F.name}), {'boot', 'smoothmedian'}))) +inst_files = dir (inst_dir); +if (all (arrayfun (@(name) ismember (sprintf ('%s.%s', name{:}, mexext), ... + {inst_files.name}), {'boot', 'smoothmedian'}))) try boot (1, 1); smoothmedian (1); @@ -55,9 +56,9 @@ make_done = false; end if (~ make_done) - warning ('For optimal performance, run the ''make'' command in order to copy or compile the appropriate binaries') + warning ('For optimal performance, run the ''make'' command to copy or compile the appropriate binaries') end % Clean up -clear info isoctave S comment octaverc fid msg inst_dir d +clear info isoctave S comment octaverc fid msg inst_dir inst_files d make_done diff --git a/make.m b/make.m index 042d8d0..9494ec6 100755 --- a/make.m +++ b/make.m @@ -137,7 +137,7 @@ end fprintf ('If you now execute ''install'', .m files equivalent to the mex files will be used instead. \n') else - fprintf ('\n''make'' completed successfully. Please now run the ''install'' command. \n') + fprintf ('\n''make'' completed successfully. \nPlease now run the ''install'' command if you haven''t done so already. \n') end clear arch arch_idx binary binary_paths comp endian info isoctave maxsize errflag retval