diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 15:56:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 15:56:50 +0000 |
| commit | a89825c888c4350195ba77e809058a234d3671de (patch) | |
| tree | 7c1c87cd59d1864613d2b9729fb75be93bb4f916 /config_office/set_soenv.in | |
| parent | 41f21b36207961c41c01eb1f17186495554bed47 (diff) | |
INTEGRATION: CWS unifysound01_DEV300 (1.156.12); FILE MERGED
2008/01/15 15:31:15 cmc 1.156.12.6: RESYNC: (1.164-1.168); FILE MERGED
2007/12/03 10:13:40 cmc 1.156.12.5: RESYNC: (1.158-1.164); FILE MERGED
2007/10/30 15:09:59 cmc 1.156.12.4: RESYNC: (1.157-1.158); FILE MERGED
2007/10/09 08:08:11 cmc 1.156.12.3: RESYNC: (1.156-1.157); FILE MERGED
2007/08/31 10:14:41 cmc 1.156.12.2: #i81172# death to vcl sound
2007/08/31 09:50:49 cmc 1.156.12.1: #i81172# death to vcl sound
Diffstat (limited to 'config_office/set_soenv.in')
| -rw-r--r-- | config_office/set_soenv.in | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index 31ddc5bea1df..9a4d9b2fdb31 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1,8 +1,8 @@ #!@PERL@ -w # # Program: set_soenv.in -# Version: $Revision: 1.177 $ -# Date: $Date: 2008-03-06 15:16:57 $ +# Version: $Revision: 1.178 $ +# Date: $Date: 2008-03-07 16:56:50 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -84,7 +84,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $SHELL, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $LD_LIBRARY_PATH, $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, - $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $PERL, + $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL, $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, @@ -1319,10 +1319,6 @@ elsif ($platform =~ m/darwin/) # Append old PATH $PATH .= $ps.$oldPATH; - - # append PATHEXTRA - $PATHEXTRA = "@PATHEXTRA@"; - $PATH .= $PATHEXTRA; } else { AddWarning( "set_soenv", "$platform not configured for general environment paths" ); @@ -1856,7 +1852,6 @@ ToFile( "SCPDEFS", '@SCPDEFS@', "e" ); ToFile( "SOLAREXTRAINC", $SOLAREXTRAINC, "e" ); ToFile( "SOLAREXTRALIB", $SOLAREXTRALIB, "e" ); ToFile( "PATH", $PATH, "e" ); -ToFile( "PATHEXTRA", $PATHEXTRA, "e" ); ToFile( "SOLARLIB", $SOLARLIB, "e" ); ToFile( "SOLARINC", $SOLARINC, "e" ); ToFile( "COMP_ENV", $COMP_ENV, "e" ); @@ -1969,15 +1964,6 @@ ToFile( "CURL_CFLAGS", "@CURL_CFLAGS@", "e" ); ToFile( "CURL_LIBS", "@CURL_LIBS@", "e" ); ToFile( "SYSTEM_BOOST", "@SYSTEM_BOOST@", "e" ); ToFile( "SYSTEM_VIGRA", "@SYSTEM_VIGRA@", "e" ); -ToFile( "SYSTEM_NAS", "@SYSTEM_NAS@", "e" ); -ToFile( "NAS_INCLUDES", "@NAS_INCLUDES@", "e" ); -ToFile( "ENABLE_NAS", "@ENABLE_NAS@", "e" ); -ToFile( "ENABLE_PASF", "@ENABLE_PASF@", "e" ); -ToFile( "SYSTEM_SNDFILE", "@SYSTEM_SNDFILE@", "e" ); -ToFile( "SNDFILE_CFLAGS", "@SNDFILE_CFLAGS@", "e" ); -ToFile( "SNDFILE_LIBS", "@SNDFILE_LIBS@", "e" ); -ToFile( "SYSTEM_PORTAUDIO", "@SYSTEM_PORTAUDIO@", "e" ); -ToFile( "PA_VER", "@PA_VER@", "e" ); ToFile( "SYSTEM_NEON", "@SYSTEM_NEON@", "e" ); ToFile( "NEON_VERSION", "@NEON_VERSION@", "e" ); ToFile( "NEON_LIBS", "@NEON_LIBS@", "e" ); |