diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:38:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:38:02 +0000 |
| commit | 1a55a8d3b593e3fcae08c583174acc06f947b6b4 (patch) | |
| tree | a3ddd50b4da10ee3eb6551b91b5a2fb91d1d4194 /registry | |
| parent | bd76e4945aa41f118efc3a72c67e6df8a16b1a79 (diff) | |
INTEGRATION: CWS sb83 (1.10.4); FILE MERGED
2008/03/17 08:54:45 sb 1.10.4.2: RESYNC: (1.10-1.11); FILE MERGED
2008/01/08 16:37:52 sb 1.10.4.1: #i84200# changing LINKFLAGSRUNPATH superseded by APPnRPATH
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/tools/makefile.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk index 56ab9483907e..c3c7a2e646c0 100644 --- a/registry/tools/makefile.mk +++ b/registry/tools/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: obo $ $Date: 2008-02-25 16:03:09 $ +# last change: $Author: vg $ $Date: 2008-03-18 12:38:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -42,12 +42,6 @@ LIBTARGET=NO ENABLE_EXCEPTIONS := TRUE -.IF "$(OS)" == "LINUX" -LINKFLAGSRUNPATH = -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' -.ELIF "$(OS)" == "SOLARIS" -LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:$$ORIGIN'\' -.ENDIF - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk |