From 8a07a696935255881e91f8790c41f2b9b5de2b07 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Mon, 13 Dec 2010 11:58:15 +0000 Subject: [PATCH] Add input rdef location to include dir, otherwise when rc reads from stdin, no include dir is defined and import commands will failed then. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39825 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/develop/makefile-engine | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/develop/makefile-engine b/data/develop/makefile-engine index ec3c5aefc7..b43c393f5d 100644 --- a/data/develop/makefile-engine +++ b/data/develop/makefile-engine @@ -153,7 +153,7 @@ ifeq ($(CPU), ppc) LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -I, $(path))) SYS_INCLUDES += -i- SYS_INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -i , $(path))) - + INCLUDES = $(LOC_INCLUDES) $(SYS_INCLUDES) endif endif @@ -272,9 +272,9 @@ $(OBJ_DIR)/%.o : %.CPP # rules to compile resource definition files $(OBJ_DIR)/%.rsrc : %.rdef - cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o "$@" - + cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -I $(dir $<) -o "$@" - $(OBJ_DIR)/%.rsrc : %.RDEF - cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o "$@" - + cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -I $(dir $<) -o "$@" - # rules to handle lex/flex and yacc/bison files