diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 14:44:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 14:44:40 +0000 |
| commit | a453c430b9a5d01ecc5aa063ca277a4343605d35 (patch) | |
| tree | f542b7eacc8af8a870c179cef1ff96975c5c1a2f /soldep | |
| parent | d0cbcbe8f6b88fe2b8d41de5edcb07a38c67f27c (diff) | |
INTEGRATION: CWS ubuntusoclient (1.7.6); FILE MERGED
2008/06/20 14:47:54 vg 1.7.6.2: #158126# Ubuntu: use local perl
2008/06/12 14:11:53 vg 1.7.6.1: #158126# Ubuntu: use local perl
Diffstat (limited to 'soldep')
| -rw-r--r-- | soldep/util/perl.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/soldep/util/perl.mk b/soldep/util/perl.mk index bf261111d343..7eefded99e1d 100644 --- a/soldep/util/perl.mk +++ b/soldep/util/perl.mk @@ -8,7 +8,7 @@ # # $RCSfile: perl.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # # This file is part of OpenOffice.org. # @@ -35,10 +35,17 @@ PERL_LIB=$(BUILD_TOOLS)$/..$/perl$/lib$/core$/perl58.lib .ENDIF .IF "$(OS)$(CPU)" == "LINUXI" -SOLARINC+=-I$(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i686-linux$/CORE -PERL_LIB= -lcrypt \ + .IF "$(OUTPATH)" == "unxubti8" # Hack for Ububtu x86 builds in SO environment + SOLARINC+=-I$/usr$/lib$/perl$/5.8.8$/CORE + PERL_LIB= -lcrypt \ + $/usr$/lib$/libperl.a \ + $/usr$/lib$/perl$/5.8.8$/auto/DynaLoader/DynaLoader.a + .ELSE + SOLARINC+=-I$(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i686-linux$/CORE + PERL_LIB= -lcrypt \ $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i686-linux$/CORE$/libperl.a \ $(BUILD_TOOLS)$/..$/..$/lib$/perl5$/5.8.3$/i686-linux$/auto/DynaLoader/DynaLoader.a + .ENDIF .ENDIF .IF "$(OS)$(CPU)" == "SOLARISS" |