60 fi |
60 fi |
61 |
61 |
62 |
62 |
63 # Copy built non-universal binaries in place |
63 # Copy built non-universal binaries in place |
64 $(UNIVERSAL_COPY_LIST): |
64 $(UNIVERSAL_COPY_LIST): |
65 BUILT_COPY_FILE="$(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)"; \ |
65 BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \ |
66 if [ -f $${BUILT_COPY_FILE} ]; then \ |
66 if [ -n "$${BUILT_COPY_FILES}" ]; then \ |
67 $(MKDIR) -p $(shell dirname $@); \ |
67 for i in $${BUILT_COPY_FILES}; do \ |
68 $(CP) $${BUILT_COPY_FILE} $@; \ |
68 if [ -f $${i} ]; then \ |
|
69 $(MKDIR) -p $(shell dirname $@); \ |
|
70 $(CP) $${i} $@; \ |
|
71 fi; \ |
|
72 done; \ |
69 fi |
73 fi |
70 |
74 |
71 |
75 |
72 # Replace arch specific binaries with universal binaries |
76 # Replace arch specific binaries with universal binaries |
73 export_universal: |
77 export_universal: |