diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:44 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:44 +0100 |
| commit | 5f08d6e5a4383db99a1ed314181b594a338200dc (patch) | |
| tree | 12fda47cee050e541880785f349cb98438ce1972 /set_soenv.in | |
| parent | faae793ae86558e42f948b89920665be402db1f8 (diff) | |
| parent | e3511dc343c944530c6c48e6990b4f4f8d522535 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
configure
configure.in
instsetoo_native/util/openoffice.lst
set_soenv.in
solenv/bin/cws.pl
solenv/bin/modules/installer/simplepackage.pm
solenv/gbuild/LinkTarget.mk
solenv/gbuild/extensions/post_PackModule.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/windows.mk
solenv/inc/installationtest.mk
solenv/inc/minor.mk
soltools/cpp/_eval.c
Diffstat (limited to 'set_soenv.in')
| -rwxr-xr-x | set_soenv.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/set_soenv.in b/set_soenv.in index 405fda66ac74..2d3731478d9d 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -998,7 +998,7 @@ $XINC = PathFormat('@XINC@'); # X11 includes # Mac OS X/Darwin only variables. if ( $platform =~ m/darwin/ ) -{ $FRAMEWORKSHOME = $ds."System".$ds."Library".$ds."Frameworks"; +{ $FRAMEWORKSHOME = $ds."Developer".$ds."SDKs".$ds."MacOSX10.4u.sdk".$ds."System".$ds."Library".$ds."Frameworks"; if ( $XLIB eq "no_x_libraries" ) { $GUIBASE = "aqua"; } else { @@ -1516,6 +1516,7 @@ else } $gb_REPOS = $SRC_ROOT; +my $BUILD_TYPE = "@BUILD_TYPE@"; if ('@WITH_LANG@' ne "") { @@ -1602,6 +1603,7 @@ ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE", "e" ); ToFile( "PRODUCT", "@PRODUCT@", "e" ); ToFile( "PROFULLSWITCH", "@PROFULLSWITCH@", "e" ); ToFile( "PROEXT", $PROEXT, "e" ); +ToFile( "VALGRIND_CFLAGS", "@VALGRIND_CFLAGS@", "e" ); ToFile( "UNIXWRAPPERNAME", "@UNIXWRAPPERNAME@","e" ); ToFile( "BUILD_MOZAB", "@BUILD_MOZAB@", "e" ); ToFile( "PREBUILD_MOZAB", $PREBUILD_MOZAB, "e" ); @@ -2095,7 +2097,6 @@ if ($platform =~ m/os2/) ToFile( "SWITCHAR", "-", "e"); } ToFile( "SAL_ENABLE_FILE_LOCKING", "1", "e"); -ToFile( "DBGSV_INIT", "$SOLARENV/bin/dbgsv.ini", "e"); ToFile( "ENV_SCRIPT", "$outfile", "e" ); # |