8004491: Build breakage on Linux due to 8004188

[Kelly O'Hair]

Sigh...    Do I need to send out another email on changing ANY makefiles without letting us know? :^(

-kto

On Dec 5, 2012, at 2:52 AM, Alan Bateman wrote:

> 
> The new build is broken in jdk8/tl again, this time it's Linux only and the culprit is this change:
> 
> http://hg.openjdk.java.net/jdk8/tl/jdk/rev/44ae777564eb
> 
> Attached is the proposed change. I'd like to push it to jdk8/tl/jdk.
> 
> -Alan
> 
> 
> diff --git a/makefiles/CopyFiles.gmk b/makefiles/CopyFiles.gmk
> --- a/makefiles/CopyFiles.gmk
> +++ b/makefiles/CopyFiles.gmk
> @@ -356,21 +356,9 @@
> 
> ##########################################################################################
> 
> -PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security
> +PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-$(OPENJDK_TARGET_OS)
> PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security
> 
> -ifeq ($(OPENJDK_TARGET_OS), solaris)
> -    PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-solaris
> -endif
> -
> -ifeq ($(OPENJDK_TARGET_OS), windows)
> -    PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-windows
> -endif
> -
> -ifeq ($(OPENJDK_TARGET_OS), macosx)
> -    PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-macosx
> -endif
> -
> $(PROPS_DST): $(PROPS_SRC)
>     $(MKDIR) -p $(@D)
>     $(RM) $@
>