From 6551738d8999e307083ed9b3711e2ec5cad930d3 Mon Sep 17 00:00:00 2001 From: Igor Mitsyanko Date: Wed, 27 Jun 2012 19:55:32 +0400 Subject: [PATCH] tizen install: account for existing targets Currently tizen's Makefile install target doesn't check what target emulators were actually build and tries to install both x86 and ARM emulators. This results in error when only one emulator was built. This commit fixes this. Signed-off-by: Igor Mitsyanko --- tizen/src/Makefile | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/tizen/src/Makefile b/tizen/src/Makefile index bee84fe3b6..406ee2d584 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -47,26 +47,34 @@ distclean: install: all mkdir -p $(EMUL_DIR)/bin mkdir -p $(EMUL_DIR)/etc - mkdir -p $(EMUL_DIR)/x86 - mkdir -p $(EMUL_DIR)/x86/data - mkdir -p $(EMUL_DIR)/arm - mkdir -p $(EMUL_DIR)/arm/data - mkdir -p $(EMUL_DIR)/x86/data/pc-bios - cp ../../i386-softmmu/qemu-system-i386 $(EMUL_DIR)/bin/emulator-x86 - cp ../../arm-softmmu/qemu-system-arm $(EMUL_DIR)/bin/emulator-arm + @for target in $(TARGET_DIRS); do \ + case "$$target" in \ + i386-softmmu) \ + mkdir -p $(EMUL_DIR)/x86 ;\ + mkdir -p $(EMUL_DIR)/x86/data ;\ + mkdir -p $(EMUL_DIR)/x86/data/pc-bios ;\ + cp ../../i386-softmmu/qemu-system-i386 $(EMUL_DIR)/bin/emulator-x86 ;\ + cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/x86/data/pc-bios ;\ + cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/x86/data/pc-bios ;\ + cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/x86/data/pc-bios ;\ + cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/x86/data/pc-bios ;\ + cp -dpr ../../pc-bios/vgabios-maruvga.bin $(EMUL_DIR)/x86/data/pc-bios \ + ;; \ + arm-softmmu) \ + mkdir -p $(EMUL_DIR)/arm ;\ + mkdir -p $(EMUL_DIR)/arm/data ;\ + cp ../../arm-softmmu/qemu-system-arm $(EMUL_DIR)/bin/emulator-arm ; \ + if [ ! -z "$$CONFIG_OPENGLES" ] ; then mkdir -p $(EMUL_DIR)/bin/lib ; \ + cp -dpr ../../arm-softmmu/lib/gles $(EMUL_DIR)/bin/lib ; \ + fi \ + ;; \ + esac \ + done cp skin/client/emulator-skin.jar $(EMUL_DIR)/bin - @if test -d "../../arm-softmmu/lib/gles"; then \ - mkdir -p $(EMUL_DIR)/bin/lib; cp -dpr ../../arm-softmmu/lib/gles $(EMUL_DIR)/bin/lib; fi ifdef CONFIG_WIN32 cp check-hax.exe $(EMUL_DIR)/bin -else - endif cp ../../qemu-img $(EMUL_DIR)/bin cp -dpr skin/client/skins $(EMUL_DIR) cp -dpr ../license $(EMUL_DIR) - cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/x86/data/pc-bios - cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/x86/data/pc-bios - cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/x86/data/pc-bios - cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/x86/data/pc-bios - cp -dpr ../../pc-bios/vgabios-maruvga.bin $(EMUL_DIR)/x86/data/pc-bios + -- 2.34.1