scons: do not attempt to configure if clean requested

This commit is contained in:
Dane Springmeyer 2013-02-21 16:42:33 -08:00
parent 4115903148
commit 1b3b598b80
2 changed files with 3 additions and 1 deletions

View file

@ -22,7 +22,7 @@ clean:
@find ./ -name "*.os" -exec rm {} \; @find ./ -name "*.os" -exec rm {} \;
@find ./ -name "*.o" -exec rm {} \; @find ./ -name "*.o" -exec rm {} \;
@find ./ -name "*.pyc" -exec rm {} \; @find ./ -name "*.pyc" -exec rm {} \;
@rm bindings/python/mapnik/paths.py @if test -e "bindings/python/mapnik/paths.py"; then rm "bindings/python/mapnik/paths.py"; fi
distclean: distclean:
@if test -e "config.cache"; then rm "config.cache"; fi @if test -e "config.cache"; then rm "config.cache"; fi

View file

@ -454,6 +454,8 @@ HELP_REQUESTED = False
if ('-h' in command_line_args) or ('--help' in command_line_args): if ('-h' in command_line_args) or ('--help' in command_line_args):
HELP_REQUESTED = True HELP_REQUESTED = True
if ('-c' in command_line_args) or ('--clean' in command_line_args):
HELP_REQUESTED = True
if 'configure' in command_line_args and not HELP_REQUESTED: if 'configure' in command_line_args and not HELP_REQUESTED:
force_configure = True force_configure = True