diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2010-11-06 00:30:03 +0100 |
|---|---|---|
| committer | Robert Nagy <robert@openbsd.org> | 2011-01-26 11:43:50 +0100 |
| commit | 2eee81c2c27eadc01f2a168d46571d7e9093a29b (patch) | |
| tree | 3da834ae6eed64e0e7223cd5a21931b2cc88cdca | |
| parent | d3a4702de8428109a906bad9776be4cfb4bf38b2 (diff) | |
Pass thru PYTHON, found by configure.
Will be used by filter/source/config/fragments/makefile.mk.
| -rw-r--r-- | set_soenv.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in index 1c1e97bd6..aa12caf93 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") { |