diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-03-07 15:32:52 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-03-07 15:32:52 +0000 |
| commit | 69a1c8e79f5de0f09ae5d4ae42f1520ebfbc31f5 (patch) | |
| tree | c66eb2e33d798d9bf36e41a31289980aa529e95f /editors/openoffice-1.1/files/patch-set_soenv.1 | |
| parent | Shortened description. (diff) | |
Add include path $STLPORT_inc_stlport for FreeBSD too and remove a second
instance of this include path.
Notes
Notes:
svn path=/head/; revision=55680
Diffstat (limited to 'editors/openoffice-1.1/files/patch-set_soenv.1')
| -rw-r--r-- | editors/openoffice-1.1/files/patch-set_soenv.1 | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/editors/openoffice-1.1/files/patch-set_soenv.1 b/editors/openoffice-1.1/files/patch-set_soenv.1 index 96793dadbf6d..7fc4bc5acc06 100644 --- a/editors/openoffice-1.1/files/patch-set_soenv.1 +++ b/editors/openoffice-1.1/files/patch-set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Tue Nov 20 18:26:33 2001 -+++ set_soenv.1 Tue Mar 5 00:12:09 2002 +--- set_soenv.1.orig Thu Mar 7 16:23:57 2002 ++++ set_soenv.1 Thu Mar 7 16:24:14 2002 @@ -954,7 +954,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; @@ -32,3 +32,33 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; +@@ -1067,25 +1083,19 @@ + { + $SOLARINC .= $I.$USR.$INCLUDE. + $STLPORT_stlport; +-if ($platform eq "$Linux") +-{ +-# This simply adds an include path, so even cases that break the FHS work +-$SOLARINC .= $STLPORT_inc_stlport; +-} ++ + if ($platform eq "$Solaris") + { + $SOLARINC .= '/SC5 '; +-} +-# Platform dependent include path at the top of this list of include paths +-if ($platform eq "$Solaris") +-{ $SOLARINC .= $I.'$COMPATH'.$ds."include"; ++$SOLARINC .= $I.'$COMPATH'.$ds."include"; + } + +-if ($platform eq "$Linux") ++if (($platform eq "$Linux") or ($platform eq "$FreeBSD")) + { + # This simply adds an include path, so even cases that break the FHS work + $SOLARINC .= $STLPORT_inc_stlport; + } ++ + $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". + $I.'$JAVA_HOME'.$INCLUDE; + |