From 9be1f79362c7c8d3b35d33567c4d337d37a5717f Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Thu, 19 Jan 2012 01:53:39 -0600
Subject: avoid exporting un-necessary symbol/alias for stable scripts

---
 solenv/bin/build.pl    | 4 ++--
 solenv/inc/settings.mk | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index a641ca31f41f..21fb276ef1e5 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -191,7 +191,7 @@
     my $verbose = 0;
 
     my @modules_built = ();
-    my $deliver_command = $ENV{DELIVER};
+    my $deliver_command = "deliver.pl";
     my %prj_platform = ();
     my $check_error_string = '';
     my $dmake = '';
@@ -1512,7 +1512,7 @@ sub cancel_build {
     print STDERR "\n";
     print STDERR "" . $ENV{'OOO_SHELL'} . "\n";
     print STDERR "cd " . $ENV{'SRC_ROOT'} . "\n";
-    print STDERR "source ./" . $ENV{'ENV_SCRIPT'} . "\n";
+    print STDERR "source ./build_env\n";
     print STDERR "cd $module\n";
     if ($source_config->is_gbuild($module) )
     {
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c3eddcd4ed2b..65751ebcb8d5 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -271,6 +271,9 @@ PROFILE=
 DBGUTIL=
 dbgutil=
 
+ZIPDEP:="zipdep.pl"
+
+
 # ===========================================================================
 # unter NT werden Variablennamen an untergeordnete makefiles UPPERCASE
 # weitergereicht, aber case significant ausgewertet!
@@ -563,7 +566,7 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
 # target instead of using $(OUT)/inc/myworld.mk as target name.
 # (See iz62795)
 $(posix_PWD)/$(OUT)/inc/%world.mk :
-    @$(MKOUT) $(ROUT)
+    @mkout.pl $(ROUT)
     @echo $(EMQ)# > $@
 
 .INCLUDE :  $(posix_PWD)/$(OUT)/inc/myworld.mk
-- 
cgit