From c47e8d7385cad69f2b9999804ed9e38bd5abc65d Mon Sep 17 00:00:00 2001 From: "jinseok86.kim" Date: Mon, 12 Dec 2011 16:15:29 +0900 Subject: [PATCH] [Title] Incorrectly merged file edited. [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] emulator-x86, emulator-arm installed to bin/ [TestCase] --- tizen/src/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tizen/src/Makefile.in b/tizen/src/Makefile.in index 54485b5..01ba8f1 100644 --- a/tizen/src/Makefile.in +++ b/tizen/src/Makefile.in @@ -230,8 +230,8 @@ endif mkdir -p $(PHONE_DIR)/x86/data/kernel-img mkdir -p $(PHONE_DIR)/x86/VMs/default mkdir -p $(PHONE_DIR)/x86/VMs/default/logs - install emulator-x86 $(PHONE_DIR)/emulator-x86 - install emulator-arm $(PHONE_DIR)/emulator-arm + install emulator-x86 $(PHONE_DIR)/bin/emulator-x86 + install emulator-arm $(PHONE_DIR)/bin/emulator-arm # install savevm.glade $(PHONE_DIR) cp -a $(VTM) $(PHONE_DIR)/bin cp -a vtm.glade $(PHONE_DIR)/etc -- 2.7.4