diff options
| author | Siri Hansen <[email protected]> | 2012-03-23 10:55:18 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-23 10:55:18 +0100 |
| commit | 13dbd2e55a746ba92a580a9521e55e338276e8c4 (patch) | |
| tree | fad77bc1cf3990d710ec76fb6ab74ac9f994d20c /lib/sasl/src/systools_make.erl | |
| parent | 8a886bda04b7656f9f6ced9be14a98d6b6df0a0a (diff) | |
| parent | fd89175a2b17e92a0b90cb28e5af2375d3aa4535 (diff) | |
| download | otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.tar.gz otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.tar.bz2 otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/sasl/src/systools_make.erl')
| -rw-r--r-- | lib/sasl/src/systools_make.erl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl index 3c1002e4a6..61e660e918 100644 --- a/lib/sasl/src/systools_make.erl +++ b/lib/sasl/src/systools_make.erl @@ -482,7 +482,7 @@ mandatory_applications([_|Apps],Kernel,Stdlib,Sasl) -> mandatory_applications([],Type,_,_) when Type=/=permanent -> error_mandatory_application(kernel,Type); mandatory_applications([],_,Type,_) when Type=/=permanent -> - error_mandatory_application(sasl,Type); + error_mandatory_application(stdlib,Type); mandatory_applications([],_,_,undefined) -> {ok, [{warning,missing_sasl}]}; mandatory_applications([],_,_,_) -> @@ -1468,15 +1468,18 @@ pack_app(#application{name=Name,vsn=V,id=Id,description=D,modules=M, {applications, App}, {included_applications, Incs}, {env, Env}, - {start_phases, SF}, {maxT, MaxT}, {maxP, MaxP} | - behave(Mod)]}. - + behave([{start_phases,SF},{mod,Mod}])]}. + +behave([{mod,[]}|T]) -> + behave(T); +behave([{start_phases,undefined}|T]) -> + behave(T); +behave([H|T]) -> + [H|behave(T)]; behave([]) -> - []; -behave(Mod) -> - [{mod, Mod}]. + []. %%______________________________________________________________________ %% mandatory modules; this modules must be loaded before processes |