[incubator-nuttx] branch master updated: tools/Makefile.win and link.bat: Fix for 'make menuconfig' (#117)

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new c600f6d  tools/Makefile.win and link.bat:  Fix for 'make menuconfig' (#117)
c600f6d is described below

commit c600f6d6cf4f98eec38ba968f63713fc25a0eb03
Author: patacongo <sp...@yahoo.com>
AuthorDate: Thu Jan 16 16:12:31 2020 -0600

    tools/Makefile.win and link.bat:  Fix for 'make menuconfig' (#117)
---
 tools/Makefile.win | 2 +-
 tools/link.bat     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/Makefile.win b/tools/Makefile.win
index b6a472f..aee011c 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -335,7 +335,7 @@ ifeq ($(CONFIG_WINDOWS_MKLINK),y)
 	$(Q) /user:administrator mklink /d $(TOPDIR)\drivers\platform $(BOARD_DIR)\drivers
 else
 	$(Q) xcopy $(BOARD_DIR)\drivers $(TOPDIR)\drivers\platform /c /q /s /e /y /i
-	$(Q) echo FAKELNK > $(TOPDIR)\drivers\platform .fakelnk
+	$(Q) echo FAKELNK > $(TOPDIR)\drivers\platform\.fakelnk
 endif
 
 ifeq ($(COMMON_DIR),y)
diff --git a/tools/link.bat b/tools/link.bat
index fbf9c5b..03c18e4 100755
--- a/tools/link.bat
+++ b/tools/link.bat
@@ -88,7 +88,9 @@ if "%usemklink%"=="y" (
 goto :End
 )
 
-xcopy %src% %link% /c /q /s /e /y /i
+rem %src% may include forward slashes.  That upsets xcopy, but not GNUWin32 cp
+rem xcopy %src% %link% /c /q /s /e /y /i
+cp -dR %src% %link%
 echo FAKELNK > %link%\.fakelnk
 goto :End