INTEGRATION: CWS jl6 (1.11.22); FILE MERGED

2004/05/04 15:35:21 jl 1.11.22.1: #109765# use new jvmfwk to find JRE installation
This commit is contained in:
Oliver Bolte 2004-06-01 07:58:57 +00:00
parent ee0c5a96d4
commit 959469d506

View file

@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.11 $ # $Revision: 1.12 $
# #
# last change: $Author: hr $ $Date: 2004-02-02 18:57:32 $ # last change: $Author: obo $ $Date: 2004-06-01 08:58:57 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@ -105,7 +105,7 @@ SHL1STDLIBS=$(UNOTOOLSLIB) \
$(SALLIB) \ $(SALLIB) \
-lX11 -lX11
.IF "$(SOLAR_JAVA)"!="" .IF "$(SOLAR_JAVA)"!=""
SHL1STDLIBS+=$(JVMACCESSLIB) SHL1STDLIBS+=$(JVMFWKLIB)
.ENDIF .ENDIF
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def