Bläddra i källkod

[build] Fixes documentation build profile dependency (#11801)

Marek Safar 7 år sedan
förälder
incheckning
cd69b727d0
2 ändrade filer med 5 tillägg och 4 borttagningar
  1. 3 2
      docs/Makefile.am
  2. 2 2
      mcs/build/rules.make

+ 3 - 2
docs/Makefile.am

@@ -52,7 +52,8 @@ EXTRA_DIST = \
 
 -include $(mcs_topdir)/build/config.make
 
-CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
+DOC_PROFILE:=net_4_x
+CLASS=$(mcs_topdir)/class/lib/$(DOC_PROFILE)
 
 dist-hook:
 	$(mkdir_p)  $(distdir)/sources
@@ -68,7 +69,7 @@ clean-local:
 	-rm -f deploy/* convert.exe* AgilityPack.dll*
 	-rm -f $(ASSEMBLED_DOCS)
 
-TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir)
+TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir) PROFILE=$(DOC_PROFILE)
 
 monoapi.zip: monoapi.tree
 

+ 2 - 2
mcs/build/rules.make

@@ -339,7 +339,7 @@ dist-default:
 ## Documentation stuff
 
 Q_MDOC =$(if $(V),,@echo "MDOC    [$(PROFILE_DIRECTORY)] $(notdir $(@))";)
-MDOC   =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe
+MDOC   =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(PROFILE_DIRECTORY)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(PROFILE_DIRECTORY)/mdoc.exe
 
 Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE_DIRECTORY)] $(notdir $(@))";)
-MDOC_UP  =$(Q_MDOC_UP) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe update --delete -o Documentation/en
+MDOC_UP  =$(Q_MDOC_UP) MONO_PATH="$(topdir)/class/lib/$(PROFILE_DIRECTORY)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(PROFILE_DIRECTORY)/mdoc.exe update --delete -o Documentation/en