diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:06:28 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:06:28 +0000 |
| commit | 6fd88754cf077945bdecec3806440938debac23e (patch) | |
| tree | b3138766e1fc25495b38f3d27f6e38d82517752e /jvmfwk/plugins/sunmajor | |
| parent | d6aa9b87c1ed31f221ccf7b090fcaf85849ded39 (diff) | |
INTEGRATION: CWS sb71 (1.5.78); FILE MERGED
2007/06/14 14:54:54 sb 1.5.78.1: #i75466# Adapted to new APP|SHLnRPATH.
Diffstat (limited to 'jvmfwk/plugins/sunmajor')
| -rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk index c183477dd532..d9e52d754d40 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2005-09-07 19:29:10 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:06:28 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,12 +44,6 @@ NO_DEFAULT_STL=TRUE 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 @@ -70,7 +64,7 @@ OBJFILES=$(OBJ)$/javaldx.obj APP1TARGET=javaldx APP1OBJS=$(OBJFILES) APP1STDLIBS=$(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(JVMFWKLIB) - +APP1RPATH=UREBIN # --- Targets ------------------------------------------------------ |