Skip to content

Commit 37cffd6

Browse files
committed
minor tweaks to the make and install scripts
1 parent 9791ae5 commit 37cffd6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

install.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@
4242
post_install (d);
4343

4444
% Check if the user has run the make script
45-
F = dir (inst_dir);
46-
if (all (arrayfun (@(name) ismember (sprintf ('%s.%s', name{:}, mexext),{F.name}), {'boot', 'smoothmedian'})))
45+
inst_files = dir (inst_dir);
46+
if (all (arrayfun (@(name) ismember (sprintf ('%s.%s', name{:}, mexext), ...
47+
{inst_files.name}), {'boot', 'smoothmedian'})))
4748
try
4849
boot (1, 1);
4950
smoothmedian (1);
@@ -55,9 +56,9 @@
5556
make_done = false;
5657
end
5758
if (~ make_done)
58-
warning ('For optimal performance, run the ''make'' command in order to copy or compile the appropriate binaries')
59+
warning ('For optimal performance, run the ''make'' command to copy or compile the appropriate binaries')
5960
end
6061

6162
% Clean up
62-
clear info isoctave S comment octaverc fid msg inst_dir d
63+
clear info isoctave S comment octaverc fid msg inst_dir inst_files d make_done
6364

make.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
end
138138
fprintf ('If you now execute ''install'', .m files equivalent to the mex files will be used instead. \n')
139139
else
140-
fprintf ('\n''make'' completed successfully. Please now run the ''install'' command. \n')
140+
fprintf ('\n''make'' completed successfully. \nPlease now run the ''install'' command if you haven''t done so already. \n')
141141
end
142142

143143
clear arch arch_idx binary binary_paths comp endian info isoctave maxsize errflag retval

0 commit comments

Comments
 (0)