From 1211c777663c4716caa0e3a58f3ea84dab1ab714 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 17 Oct 2017 15:08:30 -0700
Subject: [PATCH] [lua] Move tools to /tools/lua

---
 ports/lua/CMakeLists.txt | 6 +++---
 ports/lua/CONTROL        | 2 +-
 ports/lua/portfile.cmake | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt
index a96718953..3fa62fe2c 100644
--- a/ports/lua/CMakeLists.txt
+++ b/ports/lua/CMakeLists.txt
@@ -45,7 +45,7 @@ ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS )
 ADD_LIBRARY ( lua ${SRC_LIBLUA} )
 
 IF (BUILD_SHARED_LIBS)
-    TARGET_COMPILE_DEFINITIONS (lua PRIVATE -DLUA_BUILD_AS_DLL )
+    TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_BUILD_AS_DLL )
 ENDIF ()
 
 INSTALL ( TARGETS lua
@@ -55,11 +55,11 @@ INSTALL ( TARGETS lua
 )
 
 IF (NOT DEFINED SKIP_INSTALL_TOOLS)
-    ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler
+    ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler uses non-exported APIs, so must include sources directly.
     ADD_EXECUTABLE ( luai src/lua.c )  # interpreter
     TARGET_LINK_LIBRARIES ( luai lua )
     SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai )
-    INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools )
+    INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/lua )
 ENDIF ()
 
 IF (NOT DEFINED SKIP_INSTALL_HEADERS)
diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL
index fa26bb00b..836ae345a 100644
--- a/ports/lua/CONTROL
+++ b/ports/lua/CONTROL
@@ -1,3 +1,3 @@
 Source: lua
-Version: 5.3.4-3
+Version: 5.3.4-4
 Description: a powerful, fast, lightweight, embeddable scripting language
diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake
index 3b7e8779c..a1dcbd379 100644
--- a/ports/lua/portfile.cmake
+++ b/ports/lua/portfile.cmake
@@ -33,9 +33,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(READ ${CURRENT_PACKAGES_DIR}/include/luaconf.h LUA_CONF_H)
     string(REPLACE "defined(LUA_BUILD_AS_DLL)" "1" LUA_CONF_H "${LUA_CONF_H}")
     file(WRITE ${CURRENT_PACKAGES_DIR}/include/luaconf.h "${LUA_CONF_H}")
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools)
 endif()
 
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lua)
+
 # Handle copyright
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua)
 vcpkg_copy_pdbs()