diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:32:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:32:10 +0000 |
| commit | c1650278fadb1e38247f2216fd06dc42677750e0 (patch) | |
| tree | a94f25f104aa66017249186b6695b628395f2855 /libxslt | |
| parent | 54bc87357cc266473d5dc3c1651c5ce97d5d4142 (diff) | |
INTEGRATION: CWS sb71 (1.4.6); FILE MERGED
2007/08/23 17:15:25 sb 1.4.6.4: RESYNC: (1.5-1.9); FILE MERGED
2007/07/18 08:58:19 sb 1.4.6.3: RESYNC: (1.4-1.5); FILE MERGED
2007/06/14 09:42:14 sb 1.4.6.2: #i75466# Adapted RPATHs to find shared libraries in extracted URE.
2007/06/13 15:26:20 sb 1.4.6.1: #i78310# Merged in 1.4.4.1.
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 5593723b2e86..8b9df1ca0f79 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hr $ $Date: 2007-08-03 12:41:11 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:32:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -80,10 +80,10 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" -LDFLAGS:=-Wl,-R'$$$$ORIGIN' +LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" .IF "$(SYSBASE)"!="" |