1 # |
1 # |
2 # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. |
7 # published by the Free Software Foundation. |
72 done; \ |
72 done; \ |
73 fi |
73 fi |
74 |
74 |
75 |
75 |
76 # Replace arch specific binaries with universal binaries |
76 # Replace arch specific binaries with universal binaries |
|
77 # Do not touch jre/lib/{client,server}/libjsig.$(LIBRARY_SUFFIX) |
|
78 # That symbolic link belongs to the 'jdk' build. |
77 export_universal: |
79 export_universal: |
78 $(RM) -r $(EXPORT_PATH)/jre/lib/{i386,amd64} |
80 $(RM) -r $(EXPORT_PATH)/jre/lib/{i386,amd64} |
79 $(RM) -r $(JDK_IMAGE_DIR)/jre/lib/{i386,amd64} |
81 $(RM) -r $(JDK_IMAGE_DIR)/jre/lib/{i386,amd64} |
80 $(RM) $(JDK_IMAGE_DIR)/jre/lib/{client,server}/libjsig.$(LIBRARY_SUFFIX) |
|
81 ($(CD) $(EXPORT_PATH) && \ |
82 ($(CD) $(EXPORT_PATH) && \ |
82 $(TAR) -cf - *) | \ |
83 $(TAR) -cf - *) | \ |
83 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xpf -) |
84 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xpf -) |
84 |
85 |
85 |
86 |
86 # Overlay universal binaries |
87 # Overlay universal binaries |
|
88 # Do not touch jre/lib/{client,server}/libjsig.$(LIBRARY_SUFFIX) |
|
89 # That symbolic link belongs to the 'jdk' build. |
87 copy_universal: |
90 copy_universal: |
88 $(RM) -r $(JDK_IMAGE_DIR)$(COPY_SUBDIR)/jre/lib/{i386,amd64} |
91 $(RM) -r $(JDK_IMAGE_DIR)$(COPY_SUBDIR)/jre/lib/{i386,amd64} |
89 $(RM) $(JDK_IMAGE_DIR)$(COPY_SUBDIR)/jre/lib/{client,server}/libjsig.$(LIBRARY_SUFFIX) |
|
90 ($(CD) $(EXPORT_PATH)$(COPY_SUBDIR) && \ |
92 ($(CD) $(EXPORT_PATH)$(COPY_SUBDIR) && \ |
91 $(TAR) -cf - *) | \ |
93 $(TAR) -cf - *) | \ |
92 ($(CD) $(JDK_IMAGE_DIR)$(COPY_SUBDIR) && $(TAR) -xpf -) |
94 ($(CD) $(JDK_IMAGE_DIR)$(COPY_SUBDIR) && $(TAR) -xpf -) |
93 |
95 |
94 |
96 |