From 1110bbeea36ee2fa9c5bfe5ba13098f8af852036 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 5 Jun 2002 22:19:58 +0000 Subject: [PATCH] oops, #push broken for multiple targets --- ppremake/ppCommandFile.cxx | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/ppremake/ppCommandFile.cxx b/ppremake/ppCommandFile.cxx index a621a4a9a6..299de0fa9a 100644 --- a/ppremake/ppCommandFile.cxx +++ b/ppremake/ppCommandFile.cxx @@ -1434,23 +1434,19 @@ handle_mkdir_command() { vector words; tokenize_whitespace(_scope->expand_string(_params), words); - if (words.empty()) { - cerr << "No directory name specifed to #mkdir.\n"; - } else { - vector::const_iterator wi; - for (wi = words.begin(); wi != words.end(); ++wi) { - Filename dirname(*wi); - - if (dirname.is_local()) { - string prefix = _scope->expand_variable("DIRPREFIX"); - dirname = Filename(prefix, dirname); - } - - Filename filename(dirname, "file"); - if (!filename.make_dir()) { - if (!dirname.is_directory()) { - cerr << "Unable to create directory " << dirname << "\n"; - } + vector::const_iterator wi; + for (wi = words.begin(); wi != words.end(); ++wi) { + Filename dirname(*wi); + + if (dirname.is_local()) { + string prefix = _scope->expand_variable("DIRPREFIX"); + dirname = Filename(prefix, dirname); + } + + Filename filename(dirname, "file"); + if (!filename.make_dir()) { + if (!dirname.is_directory()) { + cerr << "Unable to create directory " << dirname << "\n"; } } } @@ -1655,7 +1651,7 @@ handle_push_command() { while (p < _params.length()) { // Pull off the next varname. size_t q = _scope->scan_to_whitespace(_params, p); - string varname = trim_blanks(_scope->expand_string(_params.substr(p, q))); + string varname = trim_blanks(_scope->expand_string(_params.substr(p, q - p))); string def = _scope->get_variable(varname); enclosing_scope->define_variable(varname, def);