Ver código fonte

Fix mcs/doc builds

Marek Safar 14 anos atrás
pai
commit
b73c337fcf
2 arquivos alterados com 10 adições e 10 exclusões
  1. 1 1
      mcs/Makefile
  2. 9 9
      mcs/docs/Makefile

+ 1 - 1
mcs/Makefile

@@ -6,7 +6,7 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
 
 basic_SUBDIRS := build jay mcs class
 build_SUBDIRS := build class mcs class/aot-compiler tools
-net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors
+net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
 moonlight_raw_SUBDIRS := build class
 monodroid_SUBDIRS := build class
 monotouch_SUBDIRS := build class

+ 9 - 9
mcs/docs/Makefile

@@ -32,11 +32,13 @@ MONODOC_SOURCES_INSTALL_FILES = \
 
 CLEAN_FILES += $(ASSEMBLED_DOCS)
 
-ifeq (net_4_0, $(PROFILE))
-all-local: build-documentation
+ifndef DISABLE_MCS_DOCS
+ifneq ($(PROFILE), $(DEFAULT_PROFILE))
+DISABLE_MCS_DOCS = yes
+endif
 endif
 
-all-local csproj-local test-local run-test-local run-test-ondotnet-local doc-update:
+csproj-local test-local run-test-local run-test-ondotnet-local doc-update:
 
 clean-local:
 	-rm -f $(CLEAN_FILES)
@@ -47,11 +49,15 @@ dist-local: dist-default
 MONODOC_INSTALL_DIR = $(DESTDIR)$(mono_libdir)/monodoc
 
 ifdef DISABLE_MCS_DOCS
+all-local:
+
 install-local:
 
 uninstall-local:
 
 else
+all-local: $(ASSEMBLED_DOCS)
+
 install-local:
 	$(MKINSTALLDIRS) $(MONODOC_INSTALL_DIR) $(MONODOC_INSTALL_DIR)/sources
 	$(INSTALL_DATA) $(MONODOC_SOURCES_INSTALL_FILES) $(MONODOC_INSTALL_DIR)/sources
@@ -108,12 +114,6 @@ NUNIT_DIRS = \
 	$(topdir)/nunit20/mocks/$(doc_en)      \
 	$(topdir)/nunit20/util/$(doc_en)
 
-ifdef DISABLE_MCS_DOCS
-build-documentation:
-else
-build-documentation: $(ASSEMBLED_DOCS)
-endif
-
 # To support `make -jN`, we can't mention multiple targets in the same rule;
 # DO NOT DO THIS:
 #