From 1b3b598b80fa5632e16b379d92d21d5e24548975 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 21 Feb 2013 16:42:33 -0800 Subject: [PATCH] scons: do not attempt to configure if clean requested --- Makefile | 2 +- SConstruct | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 57256f707..87964840d 100755 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ clean: @find ./ -name "*.os" -exec rm {} \; @find ./ -name "*.o" -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: @if test -e "config.cache"; then rm "config.cache"; fi diff --git a/SConstruct b/SConstruct index 4dfc82a54..ad51f5f9e 100644 --- a/SConstruct +++ b/SConstruct @@ -454,6 +454,8 @@ HELP_REQUESTED = False if ('-h' in command_line_args) or ('--help' in command_line_args): 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: force_configure = True