Syntax change for 'if' statment and remove debugging messages.
Merged minor changes in scons makefile.