Merge branch 'tizen_3.0' into tizen_4.0 34/152634/1 submit/tizen_4.0/20170929.085108
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 26 Sep 2017 15:52:21 +0000 (18:52 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 26 Sep 2017 15:52:29 +0000 (18:52 +0300)
Change-Id: Iea2a9fd71ff37becacbd2e45e3746fbc94eab2cd

1  2 
Makefile
packaging/swap-probe.spec

diff --cc Makefile
Simple merge
index fcbca0e403157ab31ed52ffcae2de85046e4332a,104b5478c0d59b75569dd08af3a22613ced528c9..2b23ded01f067826a8e6a8f967839e2185b9030f
@@@ -113,9 -125,10 +125,10 @@@ export BINDIR=%{_bindir
  export LIBDIR=%{_libdir}
  export INCLUDEDIR=%{_includedir}
  export LIB=%{_lib}
+ export ARCH_DIR=%{ARCH_DIR}
  
  # set linker path
 -make -C elf_parsing
 +make -C elf_parsing all
  export LINKER_PATH=$(LD_LIBRARY_PATH=./elf_parsing/ ./elf_parsing/parse_elf -f elf_parsing/parse_elf -i)
  
  export TIZEN_FEATURE_WAYLAND=y