Mercurial > hg > octave-nkf

comparison scripts/pkg/private/configure_make.m @ 18488:c2d1869a95ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass --verbose option to mkoctfile when installing packages with --verbose (bug #41351). * scripts/pkg/private/configure_make.m: Add '--verbose' to mkoctfile call when in verbose mode of pkg install.
author Mike Miller <mtmiller@ieee.org>
date Sun, 02 Feb 2014 16:01:10 -0800
parents d63878346099
children 7141d9728ee0
comparison
equal deleted inserted replaced
18487:9154dc252f47 18488:c2d1869a95ee
30 ver = version (); 30 ver = version ();
31 ext = octave_config_info ("EXEEXT"); 31 ext = octave_config_info ("EXEEXT");
32 mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s%s", ver, ext)); 32 mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s%s", ver, ext));
33 octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s%s", ver, ext)); 33 octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s%s", ver, ext));
34 octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext)); 34 octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext));
35 cenv = {"MKOCTFILE"; mkoctfile_program;
36 "OCTAVE_CONFIG"; octave_config_program;
37 "OCTAVE"; octave_binary;
38 "INSTALLDIR"; desc.dir};
39 scenv = sprintf ("%s=\"%s\" ", cenv{:});
40 35
41 if (! exist (mkoctfile_program, "file")) 36 if (! exist (mkoctfile_program, "file"))
42 __gripe_missing_component__ ("pkg", "mkoctfile"); 37 __gripe_missing_component__ ("pkg", "mkoctfile");
43 endif 38 endif
44 if (! exist (octave_config_program, "file")) 39 if (! exist (octave_config_program, "file"))
45 __gripe_missing_component__ ("pkg", "octave-config"); 40 __gripe_missing_component__ ("pkg", "octave-config");
46 endif 41 endif
47 if (! exist (octave_binary, "file")) 42 if (! exist (octave_binary, "file"))
48 __gripe_missing_component__ ("pkg", "octave"); 43 __gripe_missing_component__ ("pkg", "octave");
49 endif 44 endif
45
46 if (verbose)
47 mkoctfile_program = [mkoctfile_program " --verbose"];
48 endif
49
50 cenv = {"MKOCTFILE"; mkoctfile_program;
51 "OCTAVE_CONFIG"; octave_config_program;
52 "OCTAVE"; octave_binary;
53 "INSTALLDIR"; desc.dir};
54 scenv = sprintf ("%s=\"%s\" ", cenv{:});
50 55
51 ## Configure. 56 ## Configure.
52 if (exist (fullfile (src, "configure"), "file")) 57 if (exist (fullfile (src, "configure"), "file"))
53 flags = ""; 58 flags = "";
54 if (isempty (getenv ("CC"))) 59 if (isempty (getenv ("CC")))