From 7b804f3df5b0a88698ba2df618034ebb8858f068 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 6 Jan 2020 09:20:46 -0500 Subject: [PATCH] Don't run `make install` in boehm submodule (mono/mono#17907) Don't run `make install` in boehm submodule Commit migrated from https://github.com/mono/mono/commit/4c9e28b80afb29af526fd698b9922ed0a13531fb --- src/mono/Makefile.am | 6 ++++++ src/mono/configure.ac | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/mono/Makefile.am b/src/mono/Makefile.am index e050a6a..229db0b 100644 --- a/src/mono/Makefile.am +++ b/src/mono/Makefile.am @@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = $(WERROR_CFLAGS) SUBDIRS = @MONO_SUBDIRS@ +noinst_SUBDIRS = @MONO_NOINST_SUBDIRS@ DIST_SUBDIRS = $(SUBDIRS) m4 netcore netcore/corerun if !ENABLE_NETCORE @@ -93,6 +94,11 @@ mcs-do-compiler-tests: bootstrap-world: compiler-tests $(MAKE) install +install: + for mydir in $(filter-out $(noinst_SUBDIRS),$(SUBDIRS)); do \ + (cd $${mydir} && ${MAKE} install) \ + done + update-csproj: -rm msvc/scripts/order -rm msvc/scripts/order.xml diff --git a/src/mono/configure.ac b/src/mono/configure.ac index 64dfc96..00b7529 100644 --- a/src/mono/configure.ac +++ b/src/mono/configure.ac @@ -6282,9 +6282,11 @@ else fi MONO_SUBDIRS="po $mono_subdirs_libgc llvm mono $mono_subdirs_ikvm_native $mono_subdirs_support data runtime scripts man samples $mono_subdirs_tools $mono_subdirs_docs msvc acceptance-tests" + MONO_NOINST_SUBDIRS="$mono_subdirs_libgc" fi AC_SUBST(MONO_SUBDIRS) +AC_SUBST(MONO_NOINST_SUBDIRS) AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool]) AC_CONFIG_COMMANDS([nolock-libtool], [sed -e 's/lock_old_archive_extraction=yes/lock_old_archive_extraction=no/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool]) -- 2.7.4