Make mdoc a 2.0 app, not a 4.0 app.

The problem is build sanity: it's possible to disable the 4.0 profile
(--with-profile4=no) while not disabling documentation building
(--with-mcs-docs=yes is the default).  The result would be a 4.0-less
build, and thus no mdoc, and thus no mdoc to assemble the documentation,
and thus a build break as we attempted to use an app during the build
which didn't exist.

Oops.

mdoc doesn't need to be a 4.0 app anyway...

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index 9547cad26621d07469b63f3938049bd72187de08..9a28154a2aca0df7c6d3481d07cc1c1ef20f5647 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -20,7 +20,6 @@ net_4_0_dirs := \
        $(per_profile_dirs) \
        corcompare      \
        mono-xmltool    \
-       mdoc            \
        mono-shlib-cop  \
        sgen            \
        mconfig         \
@@ -46,6 +45,7 @@ net_4_0_dirs := \
 
 net_2_0_dirs := \
        $(per_profile_dirs) \
+       mdoc            \
        monodoc         \
        compiler-tester
 

diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile
index 5f46eef6826cec7e0f3610f6d9f90627bab448ad..87dc7ac79397f7e6810944f358412ff8d0839f79 100644 (file)
--- a/mcs/tools/mdoc/Makefile
+++ b/mcs/tools/mdoc/Makefile
@@ -15,7 +15,7 @@ MDOC_COMMON_FLAGS = \
        /r:System.Web.dll                                                           \
        /r:System.Xml.Linq.dll                                                      \
        /r:ICSharpCode.SharpZipLib.dll                                              \
-       /r:$(topdir)/class/lib/net_4_0/Mono.Cecil.dll
+       /r:Mono.Cecil.dll
 
 LOCAL_MCS_FLAGS = $(MDOC_COMMON_FLAGS) \
        /r:$(topdir)/class/lib/net_2_0/monodoc.dll

diff --git a/mono-core.spec.in b/mono-core.spec.in
index b557063f5bafb1463fec3185e118b6abf87bc7be..2e3658757b07a4a5ada3a98a8c5faf9240b00f93 100644 (file)
--- a/mono-core.spec.in
+++ b/mono-core.spec.in
@@ -1137,7 +1137,7 @@ Monodoc-core contains documentation tools for C#.
 %_mandir/man1/monodocer.1%ext_man
 %_mandir/man1/monodocs2html.1%ext_man
 %_mandir/man5/mdoc.5%ext_man
-%_prefix/lib/mono/4.0/mdoc.exe*
+%_prefix/lib/mono/2.0/mdoc.exe*
 %_prefix/lib/mono/4.0/mod.exe*
 %_prefix/lib/mono/gac/monodoc
 %_prefix/lib/mono/monodoc

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index c15e86eddf5f5e7e3fec6518b36700ba61df1f54..e95e2a76c7d3f12623f06cc5094a68a2469b5df1 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -56,6 +56,7 @@ scripts_2_0 = \
        csharp2$(SCRIPT_SUFFIX)                 \
        gacutil2$(SCRIPT_SUFFIX)                \
        gmcs$(SCRIPT_SUFFIX)                    \
+       mdoc$(SCRIPT_SUFFIX)                    \
        monop2$(SCRIPT_SUFFIX)                  \
        resgen2$(SCRIPT_SUFFIX)                 \
        wsdl2$(SCRIPT_SUFFIX)
@@ -68,7 +69,6 @@ scripts_4_0 = \
        installvst$(SCRIPT_SUFFIX)              \
        genxs$(SCRIPT_SUFFIX)                   \
        macpack$(SCRIPT_SUFFIX)                 \
-       mdoc$(SCRIPT_SUFFIX)                    \
        mono-cil-strip$(SCRIPT_SUFFIX)          \
        prj2make$(SCRIPT_SUFFIX)                \
        soapsuds$(SCRIPT_SUFFIX)                \