From 5e4955a4f622d878c919ac7e6630001563790cf3 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Sat, 6 Nov 2010 00:30:03 +0100 Subject: Pass thru PYTHON, found by configure. Will be used by filter/source/config/fragments/makefile.mk. --- set_soenv.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 1c1e97bd6c5e..aa12caf939ca 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -90,7 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD, $PROEXT, $TARFILE_LOCATION, - $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS); + $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS); # #------------------------------------------- # IId. Declaring the aliases. @@ -128,6 +128,9 @@ $warnfile = "warn"; # logfile configure warnings. $Warning = ""; # container for warning messages $STLPORT4 = '@STLPORT4@'; # Location of STLport4 $SYSTEM_PYTHON = '@SYSTEM_PYTHON@'; +if ($SYSTEM_PYTHON eq "NO") { + $PYTHON = "python"; +} $SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@'; $JDK = '@JDK@'; $JAVAFLAGS = '@JAVAFLAGS@'; @@ -1913,6 +1916,7 @@ ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" ); ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" ); ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" ); ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" ); +ToFile( "PYTHON", "@PYTHON@", "e" ); ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" ); ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" ); if ($SYSTEM_PYTHON eq "NO") { -- cgit