integrated patch 'build fix' from bugzilla #328246

security/coreconf/location.mk

@@ -75,4 +75,12 @@ ifndef NSPR_LIB_DIR
     NSPR_LIB_DIR = $(DIST)/lib
 endif
 
+ifdef NSS_INCLUDE_DIR
+    INCLUDES += -I$(NSS_INCLUDE_DIR)
+endif
+
+ifndef NSS_LIB_DIR
+    NSS_LIB_DIR = $(DIST)/lib
+endif
+
 MK_LOCATION = included

security/jss/build_java.pl

@@ -116,6 +116,7 @@ sub setup_vars {
     dump_cmdline_vars();
 
     $ENV{JAVA_HOME} or die "Must specify JAVA_HOME environment variable";
+    $jar = "$ENV{JAVA_HOME}/bin/jar";
     $javac = "$ENV{JAVA_HOME}/bin/javac";
     $javah = "$ENV{JAVA_HOME}/bin/javah";
     $javadoc = "$ENV{JAVA_HOME}/bin/javadoc";
@@ -227,7 +228,7 @@ MyLabel
         ensure_dir_exists($class_dir);
         print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
             "$classpath " . join(" ",@source_list));
-        print_do("sh -c 'pwd && cd $class_dir && pwd && rm -f $class_jar && pwd && ls -al && ls -al ../../dist && jar -cvmf ../../security/jss/$manifest_file $class_jar *'");
+        print_do("sh -c 'pwd && cd $class_dir && pwd && rm -f $class_jar && pwd && ls -al && ls -al ../../dist && $jar -cvmf ../../security/jss/$manifest_file $class_jar *'");
         print_do("rm -f $manifest_file");
         print "Exit status was " . ($?>>8) . "\n";
     }

security/jss/lib/config.mk

@@ -59,12 +59,12 @@ RES = $(OBJDIR)/jss.res
 RESNAME = jss.rc
 
 EXTRA_SHARED_LIBS += \
-    $(DIST)/lib/nss3.lib \
-    $(DIST)/lib/smime3.lib \
-    $(DIST)/lib/ssl3.lib \
-    $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
-    $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
-    $(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
+    $(NSS_LIB_DIR)/nss3.lib \
+    $(NSS_LIB_DIR)/smime3.lib \
+    $(NSS_LIB_DIR)/ssl3.lib \
+    $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
+    $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
+    $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \
     $(JAVA_LIBS) \
     $(DLLSYSTEM) \
     $(NULL)
@@ -72,10 +72,11 @@ EXTRA_SHARED_LIBS += \
 else
 
 EXTRA_SHARED_LIBS += \
-    -L$(DIST)/lib \
+    -L$(NSS_LIB_DIR) \
     -lnss3 \
     -lsmime3 \
     -lssl3 \
+    -L$(NSPR_LIB_DIR) \
     -lplc4 \
     -lplds4 \
     -lnspr4 \