diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-01-19 01:34:37 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 19:34:02 -0600 |
| commit | 7bf85216390f3427ca80bab2a4d17edc921d434a (patch) | |
| tree | 6afbf16dc280a38e8364a4d87238f210af7592c8 | |
| parent | 5bd28c6876bb5c6cc67e95244c63b8cc1199b225 (diff) | |
migrate SYSBASE out of set_soenv
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rwxr-xr-x | set_soenv.in | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 268b6f7e049f..5a7d880bdd5a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -325,6 +325,7 @@ export SUNTEMPLATES_ES_PACK="@SUNTEMPLATES_ES_PACK@" export SUNTEMPLATES_FR_PACK="@SUNTEMPLATES_FR_PACK@" export SUNTEMPLATES_HU_PACK="@SUNTEMPLATES_HU_PACK@" export SUNTEMPLATES_IT_PACK="@SUNTEMPLATES_IT_PACK@" +export SYSBASE="@SYSBASE@" export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@" export SYSTEM_BOOST="@SYSTEM_BOOST@" export SYSTEM_BSH="@SYSTEM_BSH@" diff --git a/configure.in b/configure.in index 499e4b85b5b6..f77df27d1443 100644 --- a/configure.in +++ b/configure.in @@ -2004,7 +2004,8 @@ if test "$build_os" = "cygwin" ; then fi fi - +# remenber SYSBASE value +AC_SUBST(SYSBASE) dnl =================================================================== dnl Checks if ccache is available diff --git a/set_soenv.in b/set_soenv.in index 3acfe8599d9c..19d071c6f2f3 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -811,13 +811,6 @@ ToFile( "SOLARINC", $SOLARINC, "e" ); ToFile( "COMP_ENV", $COMP_ENV, "e" ); ToFile( "JAVAHOME", $JAVAHOME, "e" ); ToFile( "CC", $CC, "e" ); -if ( defined $ENV{SYSBASE} ) -{ $SYSBASE = $ENV{SYSBASE}; -} -else -{ $SYSBASE = ''; -} -ToFile( "SYSBASE", "$SYSBASE", "e" ); ToFile( "BUILD_PLATFORM", "@build@", "e" ); ToFile( "HOST_PLATFORM", "@host@", "e" ); if ( '@CROSS_COMPILING@' eq 'YES' ) |