Merge remote-tracking branch 'git-svn'

Conflicts:
	share/make/Makefile.common

share/make/Makefile.common

@@ -9,13 +9,11 @@ all: build-node
 include $(RUNTIME_PATH)/make/Makefile.$(TARGET)
 -include ../../userdefined.mk
 
-build-node: compile-node #generate-doc
-
-
 ifneq ($(USE_CPP_LINKER),)
 LD=$(LD_CPP)
 endif
 
+build-node: compile-node generate-doc
 
 ################################################################################
 # Configuration
@@ -228,6 +226,7 @@ $(BINARY):
 	@if [ ! -d $$RTEMS_MAKEFILE_PATH/make ]; then \
 		echo "Please define the RTEMS_MAKEFILE_PATH variable, exiting" ; \
 	else \
+
 		$(MAKE) generate-asn1-deployment compile-c-files compile-cpp-files compile-ada-files target-objects compile-po-hi $(USER_OBJS) $(GENERATED_OBJS) ; \
 		$(CC) -o $(BINARY) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS) $(CFLAGS) ; \
 	fi
@@ -298,7 +297,7 @@ endif
 ifeq ($(TARGET), $(filter $(TARGET), win32))
 EXE=$(BINARY).exe
 $(BINARY):
-	@if [ ! -f i686-w64-mingw32-gcc: ]; then \
+	@if [ ! -f $(which i686-w64-mingw32-gcc) ]; then \
 		echo "Windows compiler is not installed in your system, exiting" ; \
 	else \
 		$(MAKE) generate-asn1-deployment target-objects compile-po-hi $(USER_OBJS) $(GENERATED_OBJS) $(TARGET_OBJECTS) ; \