Merge pull request #819 from brendanzagaeski/patch-1

[mono.git] / scripts / Makefile.am

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ff7bc2c4afadcbec7f63da6b85340351cc8e066d..7a697cd2cc1f43c89cdbdf3a23b3db5552388fbc 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -45,6 +45,10 @@ bin_SCRIPTS += $(scripts_4_0)
 bin_SCRIPTS += dmcs
 endif
 
+if INSTALL_4_5
+bin_SCRIPTS += xbuild
+endif
+
 scripts_4_0_umask = \
        makecert$(SCRIPT_SUFFIX)                \
        sn$(SCRIPT_SUFFIX)
@@ -96,9 +100,9 @@ scripts_4_0 = \
        sqlmetal$(SCRIPT_SUFFIX)                \
        sqlsharp$(SCRIPT_SUFFIX)                \
        svcutil$(SCRIPT_SUFFIX)                 \
-       xbuild$(SCRIPT_SUFFIX)                  \
        ccrewrite$(SCRIPT_SUFFIX)               \
-       cccheck$(SCRIPT_SUFFIX)
+       cccheck$(SCRIPT_SUFFIX)                 \
+       mdbrebase$(SCRIPT_SUFFIX)
 
 MDOC_SUBCOMMANDS = \
        mdoc-assemble \
@@ -148,6 +152,7 @@ EXTRA_DIST =                        \
        mono-find-provides.in   \
        mono-find-requires.in   \
        peverify.in                     \
+       xbuild.in                       \
        update_submodules               \
        mcs.in                          \
        gmcs.in                         \
@@ -186,19 +191,21 @@ REWRITE_COMMON = sed \
 
 REWRITE = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp),g'
 REWRITE_DEBUG = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp) --debug,g'
+REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
 
 REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
 REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
-if INSTALL_4_0
+if INSTALL_4_5
 REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.5,g'
-else
-REWRITE4 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
-endif
-REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
-if INSTALL_4_0
 REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,4.5,g'
-else
-REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
+else 
+       if INSTALL_4_0
+       REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.0,g'
+       REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,4.0,g'
+       else
+       REWRITE4 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
+       REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
+       endif
 endif
 
 peverify: peverify.in Makefile
@@ -237,6 +244,10 @@ nunit-console4$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
        $(REWRITE4_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
        mv -f $@.tmp $@
 
+xbuild: xbuild.in Makefile
+       $(REWRITE_COMMON) $(srcdir)/xbuild.in > $@.tmp
+       mv -f $@.tmp $@
+
 #FIXME: this is not the correct rule for mod.bat.
 mod$(SCRIPT_SUFFIX): mod.in Makefile
        $(REWRITE2) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp