Kaydet (Commit) d5f31a60 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

migrate TARFILE_LOCATION out of set_soenv

üst 9be1f793
......@@ -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@"
......
......@@ -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)
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment