Merge pull request #1857 from slluis/fix-assembly-resolver

[mono.git] / mono / mini / Makefile.am.in

diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
index fb35bbdd94a115c989a562c67d28fc9be084b306..64d6543aca9adc31201430081967578eddec89c7 100755 (executable)
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -3,13 +3,8 @@ mtest=for_loop
 monodir=$(top_builddir)
 
 # This is needed for automake dependency generation
-if INCLUDED_LIBGC
 libgc_libs=$(monodir)/libgc/libmonogc.la
 libgc_static_libs=$(monodir)/libgc/libmonogc-static.la
-else
-libgc_libs=$(LIBGC_LIBS)
-libgc_static_libs=$(LIBGC_STATIC_LIBS)
-endif
 
 libs=  \
        $(monodir)/mono/metadata/libmonoruntime.la      \
@@ -757,7 +752,7 @@ version.h: Makefile
        if test -d $(top_srcdir)/.git; then \
                (cd $(top_srcdir); \
                        LANG=C; export LANG; \
-                       branch=`git branch | grep '^\*' | cut -d ' ' -f 2`; \
+                       branch=`git branch | grep '^\*' | sed 's/(detached from .*/explicit/' | cut -d ' ' -f 2`; \
                        version=`git log --no-color --first-parent -n1 --pretty=format:%h`; \
                        echo "#define FULL_VERSION \"$$branch/$$version\""; \
                ); \