nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix handling of absolute paths

Browse source
This commit is contained in:
Gregory Nutt 2015-05-22 11:27:37 -06:00
parent bd23c4ad4e
commit 30fb2187ad
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.unix
View file

@ -74,7 +74,7 @@ ARCH_INC = $(ARCH_DIR)/include
ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y)
BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR)
else
BOARD_DIR = configs/$(CONFIG_ARCH_BOARD)
BOARD_DIR = $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)
endif
# CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file.
@ -293,13 +293,13 @@ include/arch: Make.defs
include/arch/board: include/arch Make.defs include/arch
@echo "LN: include/arch/board to $(BOARD_DIR)/include"
$(Q) $(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/include include/arch/board
$(Q) $(DIRLINK) $(BOARD_DIR)/include include/arch/board
# Link the configs/<board-name>/src dir to arch/<arch-name>/src/board
$(ARCH_SRC)/board: Make.defs
@echo "LN: $(ARCH_SRC)/board to $(BOARD_DIR)/src"
$(Q) $(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/src $(ARCH_SRC)/board
$(Q) $(DIRLINK) $(BOARD_DIR)/src $(ARCH_SRC)/board
# Link arch/<arch-name>/include/<chip-name> to arch/<arch-name>/include/chip

10
Makefile.win
View file

@ -67,7 +67,7 @@ ARCH_INC = $(ARCH_DIR)\include
ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y)
BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR)
else
BOARD_DIR = configs$(DELIM)$(CONFIG_ARCH_BOARD)
BOARD_DIR = $(TOPDIR)${DELIM}configs$(DELIM)$(CONFIG_ARCH_BOARD)
endif
# CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file.
@ -300,9 +300,9 @@ endif
include\arch\board: include\arch Make.defs include\arch
@echo LN: include\arch\board to $(BOARD_DIR)\include
ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d include\arch\board $(TOPDIR)\$(BOARD_DIR)\include
$(Q) /user:administrator mklink /d include\arch\board $(BOARD_DIR)\include
else
$(Q) xcopy $(TOPDIR)\$(BOARD_DIR)\include include\arch\board /c /q /s /e /y /i
$(Q) xcopy $(BOARD_DIR)\include include\arch\board /c /q /s /e /y /i
$(Q) echo FAKELNK > include\arch\board\.fakelnk
endif
@ -311,9 +311,9 @@ endif
$(ARCH_SRC)\board: Make.defs
@echo LN: $(ARCH_SRC)\board to $(BOARD_DIR)\src
ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(TOPDIR)\$(BOARD_DIR)\src
$(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(BOARD_DIR)\src
else
$(Q) xcopy $(TOPDIR)\$(BOARD_DIR)\src $(ARCH_SRC)\board /c /q /s /e /y /i
$(Q) xcopy $(BOARD_DIR)\src $(ARCH_SRC)\board /c /q /s /e /y /i
$(Q) echo FAKELNK > $(ARCH_SRC)\board\.fakelnk
endif