[longomatch] Use a different build directory for makefile builds

[Andoni Morales Alastruey <amorales src gnome org>]

commit e83794de4e03ec71e6dd6fc483c0300ad865c473
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Wed Mar 4 15:33:02 2015 +0100

    Use a different build directory for makefile builds
    
    Monodevelop and the builds from the shell are using differents
    versions of mono that can create conflicts.

 build/build.environment.mk |    4 ++--
 build/build.rules.mk       |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 8a43747..c73e7fa 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -6,7 +6,7 @@ MONO_ADDINS_PATH =
 DEFAULT_INSTALL_DIR = $(pkglibdir)
 
 # Build Paths
-DEFAULT_BUILD_DIR = bin
+DEFAULT_BUILD_DIR = bin_sh
 
 # External libraries to link against, generated from configure
 LINK_SYSTEM = -r:System
@@ -173,7 +173,7 @@ REF_DEP_TESTS = \
                      $(LINK_JSON) \
                      $(LINK_NUNIT)
 
-DIR_BIN = $(top_builddir)/bin
+DIR_BIN = $(top_builddir)/$(DEFAULT_BUILD_DIR)
 
 # Cute hack to replace a space with something
 colon:= :
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 05c8095..557fc59 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -13,6 +13,7 @@ THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(src
 THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
 
 BUILD_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_BUILD_DIR), $(BUILD_DIR)))
+BUILD_DIR_ABS = $(top_builddir)/$(BUILD_DIR_RESOLVED)
 
 ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
 ASSEMBLY_FILE := $(top_builddir)/$(BUILD_DIR_RESOLVED)/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
@@ -20,7 +21,7 @@ ASSEMBLY_FILE := $(top_builddir)/$(BUILD_DIR_RESOLVED)/$(ASSEMBLY).$(ASSEMBLY_EX
 INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
 
 FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
-DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
+DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(BUILD_DIR_ABS)')
 
 OUTPUT_FILES = \
        $(ASSEMBLY_FILE) \
@@ -61,7 +62,7 @@ build-debug:
 $(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
 
 $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
-       @mkdir -p $(top_builddir)/bin/migration
+       @mkdir -p $(BUILD_DIR_ABS)/migration
        $(AM_V_GEN) $(MCS) \
                $(GMCS_FLAGS) \
                $(ASSEMBLY_BUILD_FLAGS) \
@@ -71,7 +72,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
                $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(ENABLE_ATK_FLAG) \
                $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
        @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \
-               cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \
+               cp $(EXTRA_BUNDLE) $(BUILD_DIR_ABS); \
        fi;
 
 theme-icons: $(THEME_ICONS_SOURCE)