57 $(RM) -r $(EXPORT_PATH)/jre/lib/{i386,amd64} |
57 $(RM) -r $(EXPORT_PATH)/jre/lib/{i386,amd64} |
58 |
58 |
59 |
59 |
60 # Package built libraries in a universal binary |
60 # Package built libraries in a universal binary |
61 $(UNIVERSAL_LIPO_LIST): |
61 $(UNIVERSAL_LIPO_LIST): |
62 BUILT_LIPO_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \ |
62 BUILT_LIPO_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`" || test $$? = "1"; \ |
63 if [ -n "$${BUILT_LIPO_FILES}" ]; then \ |
63 if [ -n "$${BUILT_LIPO_FILES}" ]; then \ |
64 $(MKDIR) -p $(shell dirname $@); \ |
64 $(MKDIR) -p $(shell dirname $@); \ |
65 lipo -create -output $@ $${BUILT_LIPO_FILES}; \ |
65 lipo -create -output $@ $${BUILT_LIPO_FILES}; \ |
66 fi |
66 fi |
67 |
67 |
68 |
68 |
69 # Copy built non-universal binaries in place |
69 # Copy built non-universal binaries in place |
70 # - copies directories; including empty dirs |
70 # - copies directories; including empty dirs |
71 # - copies files, symlinks, other non-directory files |
71 # - copies files, symlinks, other non-directory files |
72 $(UNIVERSAL_COPY_LIST): |
72 $(UNIVERSAL_COPY_LIST): |
73 BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) -prune 2>/dev/null`"; \ |
73 BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) -prune 2>/dev/null`" || test $$? = "1"; \ |
74 if [ -n "$${BUILT_COPY_FILES}" ]; then \ |
74 if [ -n "$${BUILT_COPY_FILES}" ]; then \ |
75 for i in $${BUILT_COPY_FILES}; do \ |
75 for i in $${BUILT_COPY_FILES}; do \ |
76 $(MKDIR) -p $(shell dirname $@); \ |
76 $(MKDIR) -p $(shell dirname $@); \ |
77 $(CP) -R $${i} $@; \ |
77 $(CP) -R $${i} $@; \ |
78 done; \ |
78 done; \ |