summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsonja.mirtitsch%sun.com <devnull@localhost>2002-03-15 20:49:25 +0000
committersonja.mirtitsch%sun.com <devnull@localhost>2002-03-15 20:49:25 +0000
commit459c9050ed127dfb669c9216b16d8ad33c6515ed (patch)
tree79a23b79b26be5126e11396851c77fe9407cfaad
parent67c87211135cba8a1cfe1b221e23958bf65f3d11 (diff)
downloadnss-hg-459c9050ed127dfb669c9216b16d8ad33c6515ed.tar.gz
changed the linux directory for libjvm
-rw-r--r--security/coreconf/jdk.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/security/coreconf/jdk.mk b/security/coreconf/jdk.mk
index 18043f733..8189808c8 100644
--- a/security/coreconf/jdk.mk
+++ b/security/coreconf/jdk.mk
@@ -243,7 +243,11 @@ ifeq ($(OS_ARCH), Linux)
JAVA_CLIBS =
JAVA_LIBS = -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -lhpi
- JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
+ ifeq ($(JDK_VERSION), 1.4)
+ JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm
+ else
+ JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
+ endif
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava
JAVA_LIBS += $(JAVA_CLIBS)