Merge pull request EOSIO#9 from wanderingbort/feature/6-destdir-fixes

Fixes for DESTDIR

InstallClang.txt

@@ -1,8 +1,8 @@
 macro(install_symlink from to)
    install(CODE 
-      "execute_process(COMMAND mkdir -p ${SDK_INSTALL_PREFIX}/bin)
-       execute_process(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/bin)
-       execute_process(COMMAND ln -sf ${SDK_INSTALL_PREFIX}/bin/${from} ${CMAKE_INSTALL_PREFIX}/bin/${to})")
+      "execute_process(COMMAND mkdir -p \$ENV{DESTDIR}${SDK_INSTALL_PREFIX}/bin)
+       execute_process(COMMAND mkdir -p \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)
+       execute_process(COMMAND ln -sf  \$ENV{DESTDIR}${SDK_INSTALL_PREFIX}/bin/${from} \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/${to})")
 endmacro()
 
 install_symlink(llvm-ranlib eosio.ranlib)
@@ -67,6 +67,7 @@ install_symlink(llvm-readelf eosio-readelf)
 install_symlink(eosio-cc eosio-cc)
 install_symlink(eosio-cpp eosio-cpp)
 install_symlink(eosio-ld eosio-ld)
+install_symlink(eosio-pp eosio-pp)
 
 install(CODE "
    execute_process(COMMAND ln -sf 

external/wabt/CMakeLists.txt

@@ -289,8 +289,8 @@ if (NOT EMSCRIPTEN)
     set(WABT_EXECUTABLES ${WABT_EXECUTABLES} PARENT_SCOPE)
 
     add_custom_target(${name}-copy-to-bin ALL
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_INSTALL_BINDIR}
-       COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${name}> ${CMAKE_INSTALL_BINDIR}
+       COMMAND ${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${CMAKE_INSTALL_BINDIR}
+       COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${name}> \$ENV{DESTDIR}${CMAKE_INSTALL_BINDIR}
       DEPENDS ${name}
     )
   endfunction()
@@ -394,9 +394,6 @@ if (NOT EMSCRIPTEN)
   # install
   #install(TARGETS ${WABT_EXECUTABLES} DESTINATION bin)
   install(TARGETS eosio-pp DESTINATION ${SDK_INSTALL_PREFIX}/bin)
-  install(FILES ${SDK_INSTALL_PREFIX}/bin/eosio-pp 
-     DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME eosio-pp
-     PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 else ()
   # emscripten stuff