From: Leandro Lucarella Date: Thu, 29 Oct 2009 18:44:37 +0000 (-0300) Subject: Allow compiling from directories named "build" X-Git-Url: https://git.llucax.com/software/makeit.git/commitdiff_plain/ccb41f7307c36af6a2825090600f7b55abe073fa Allow compiling from directories named "build" If the absolute directory where the project has a component named "build" (or whatever $(BUILD_DIR_NAME) is), the build fails because the whole project directory is excluded from the obj directory tree replication. This patch fixes this bug by adding the complete absolute path to the project top-level directory ($T) to the excludes. An obsolete comment is removed too. --- diff --git a/Makeit.mak b/Makeit.mak index b1bb218..6866422 100644 --- a/Makeit.mak +++ b/Makeit.mak @@ -478,14 +478,11 @@ test: $$(test) # Create $O, $B, $L, $D and $(INCLUDE_DIR) directories and replicate the # directory structure of the project into $O. Create one symbolic link "last" # to the current build directory. -# -# NOTE: the second mkdir can yield no arguments if the project don't have any -# subdirectories, that's why the current directory "." is included, so it -# won't show an error message in case of no subdirectories. setup_build_dir__ := $(shell \ mkdir -p $O $B $L $D $(INCLUDE_DIR) $(addprefix $O,$(patsubst $T%,%,\ $(shell find $T -type d $(foreach d,$(BUILD_DIR_EXCLUDE), \ - -not -path '*/$d' -not -path '*/$d/*')))); \ + -not -path '$T/$d' -not -path '$T/$d/*' \ + -not -path '$T/*/$d' -not -path '$T/*/$d/*')))); \ rm -f $(VD)/last && ln -s $F $(VD)/last )