diff --git a/SConscript b/SConscript index d264fd34ee2a3498117db4b76a8488dd375e9f61..2b22f08f8df4b8989113c44aace3e344deec2529 100644 --- a/SConscript +++ b/SConscript @@ -62,10 +62,11 @@ pedi = Command( target = "./zipr-umb-testoutput-install", source = xforms, action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " ) +ret=[]+xforms if Dir('.').abspath == Dir('#.').abspath: - Default( pedi ) -else: - Default(xforms) + ret=ret+pedi + + if env.GetOption('clean') and os.path.isfile("manifest.txt.config"): with open("manifest.txt.config") as myfile: @@ -77,3 +78,7 @@ if env.GetOption('clean') and os.path.isfile("manifest.txt.config"): os.system( "pwd; $PEDI_HOME/pedi -c -m manifest.txt " ) shutil.rmtree(os.environ['PS_INSTALL']) + + +Default(ret) +Return('ret') diff --git a/SConstruct b/SConstruct index 217ce0e12f67963fbec959d67e93856998ab9bf7..1c04dad64c5a657f02bf5564e8a1779148034e41 100644 --- a/SConstruct +++ b/SConstruct @@ -35,5 +35,8 @@ else: env.Append(SHLINKFLAGS=" -O ") Export('env') -SConscript("SConscript") +ret=SConscript("SConscript") + +Default(ret) +Return('ret')