diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | set_soenv.in | 7 |
3 files changed, 2 insertions, 8 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index dcc5c47ff820..7ae412336269 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -400,6 +400,7 @@ export SYSTEM_SERVLETAPI="@SYSTEM_SERVLETAPI@" export SYSTEM_STDLIBS="@SYSTEM_STDLIBS@" export SYSTEM_VIGRA="@SYSTEM_VIGRA@" export SYSTEM_ZLIB="@SYSTEM_ZLIB@" +export TARFILE_LOCATION="@TARFILE_LOCATION@" export THES_SYSTEM_DIR="@THES_SYSTEM_DIR@" export TYPO_EXTENSION_PACK="@TYPO_EXTENSION_PACK@" export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@" diff --git a/configure.in b/configure.in index 2dac8593ce68..3bbf3e9688e0 100644 --- a/configure.in +++ b/configure.in @@ -3316,7 +3316,7 @@ AC_SUBST(FONTCONFIG_LIBS) dnl whether to find & fetch external tarballs? dnl =================================================================== if test -z "$TARFILE_LOCATION"; then - TARFILE_LOCATION="DEFAULT" + TARFILE_LOCATION="$SRC_ROOT/src" fi AC_SUBST(TARFILE_LOCATION) diff --git a/set_soenv.in b/set_soenv.in index 87f3f22e28d7..d5e8e5c887ef 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -158,7 +158,6 @@ chomp( $oldPATH ); # cut off new line # NB: Language options now set at 'ToFile' stage. $SOLAR_JAVA = "@SOLAR_JAVA@"; $comment = "#"; # UNIX script comment character -$TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external sources # Setting platform dependent constant values. if ( $platform =~ m/cygwin|mingw32/ ) @@ -260,11 +259,6 @@ $XLIB = PathFormat('@XLIB@'); # X11 libraries $XINC = PathFormat('@XINC@'); # X11 includes -# default TARFILE_LOCATION -if ('@TARFILE_LOCATION@' eq "DEFAULT") -{ $TARFILE_LOCATION="$SRC_ROOT/src"; -} - # $SOLARENV = PathFormat($SRC_ROOT.$SOLENV); # Location of the solver tree. @@ -514,7 +508,6 @@ ToFile( "Platform independent constant values.", $empty, "c" ); } ToFile( "nodep", "@nodep@", "e" ); -ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" ); # # Writing the platform dependent constant values to file. |