From 1d98d977ce5e5eeaed8a49581a0f9241998d2553 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Sun, 10 Apr 2011 15:51:17 -0600 Subject: [PATCH] only include security policy jars if they exist --- makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 685a77956e..367311518f 100644 --- a/makefile +++ b/makefile @@ -91,8 +91,18 @@ ifneq ($(openjdk),) classpath-jar-dep = $(openjdk-jar-dep) javahome = $(embed-prefix)/javahomeJar javahome-files = lib/zi lib/currency.data lib/security/java.security \ - lib/security/java.policy lib/security/cacerts \ - lib/security/local_policy.jar lib/security/US_export_policy.jar + lib/security/java.policy lib/security/cacerts + + local-policy = lib/security/local_policy.jar + ifeq ($(shell test -e $(openjdk)/$(local-policy) && echo found),found) + javahome-files += $(local-policy) + endif + + export-policy = lib/security/US_export_policy.jar + ifeq ($(shell test -e $(openjdk)/$(export-policy) && echo found),found) + javahome-files += $(export-policy) + endif + ifeq ($(platform),windows) javahome-files += lib/tzmappings endif