Remove the concept of platform-specific directories

Makefile.pre.in

 # Top-level Makefile for Python
 #
 # As distributed, this file is called Makefile.pre.in; it is processed
 # into the real Makefile by running the script ./configure, which
 # replaces things like @spam@ with values appropriate for your system.
 # This means that if you edit Makefile, your changes get lost the next
 # time you run the configure script.  Ideally, you can do:
 #
 #       ./configure
 #       make
@@ skipping 30 matching lines @@
 SOABI=          @SOABI@
 LDVERSION=      @LDVERSION@
 HGVERSION=      @HGVERSION@
 HGTAG=          @HGTAG@
 HGBRANCH=       @HGBRANCH@
 PGO_PROF_GEN_FLAG=@PGO_PROF_GEN_FLAG@
 PGO_PROF_USE_FLAG=@PGO_PROF_USE_FLAG@
 LLVM_PROF_MERGER=@LLVM_PROF_MERGER@
 LLVM_PROF_FILE=@LLVM_PROF_FILE@
 LLVM_PROF_ERR=@LLVM_PROF_ERR@
+DTRACE=         @DTRACE@
+DFLAGS=         @DFLAGS@
+DTRACE_HEADERS= @DTRACE_HEADERS@
+DTRACE_OBJS=    @DTRACE_OBJS@
 
 GNULD=          @GNULD@
 
 # Shell used by make (some versions default to the login shell, which is bad)
 SHELL=          /bin/sh
 
 # Use this to make a link between python$(VERSION) and python in $(BINDIR)
 LN=             @LN@
 
 # Portable install script (configure doesn't always guess right)
@@ skipping 22 matching lines @@
 CONFIGURE_CPPFLAGS=     @CPPFLAGS@
 CONFIGURE_LDFLAGS=      @LDFLAGS@
 # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
 # command line to append to these values without stomping the pre-set
 # values.
 PY_CFLAGS=      $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
 PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
 # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
 # be able to build extension modules using the directories specified in the
 # environment variables
-PY_CPPFLAGS=    $(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
+PY_CPPFLAGS=    $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
 PY_LDFLAGS=     $(CONFIGURE_LDFLAGS) $(LDFLAGS)
 NO_AS_NEEDED=   @NO_AS_NEEDED@
 LDLAST=         @LDLAST@
 SGI_ABI=        @SGI_ABI@
 CCSHARED=       @CCSHARED@
 LINKFORSHARED=  @LINKFORSHARED@
 ARFLAGS=        @ARFLAGS@
 # Extra C flags added for building the interpreter object files.
 CFLAGSFORSHARED=@CFLAGSFORSHARED@
 # C flags used for building the interpreter object files
@@ skipping 143 matching lines @@
 
 
 ##########################################################################
 # Modules
 MODULE_OBJS=    \
                 Modules/config.o \
                 Modules/getpath.o \
                 Modules/main.o \
                 Modules/gcmodule.o
 
-# Used of signalmodule.o is not available
-SIGNAL_OBJS=    @SIGNAL_OBJS@
-
 IO_H=           Modules/_io/_iomodule.h
 
 IO_OBJS=        \
                 Modules/_io/_iomodule.o \
                 Modules/_io/iobase.o \
                 Modules/_io/fileio.o \
                 Modules/_io/bufferedio.o \
                 Modules/_io/textio.o \
                 Modules/_io/bytesio.o \
                 Modules/_io/stringio.o
@@ skipping 41 matching lines @@
                 $(srcdir)/Parser/tokenizer.h
 
 PGENOBJS=       $(POBJS) $(PGOBJS)
 
 ##########################################################################
 # opcode.h generation
 OPCODE_H_DIR=   $(srcdir)/Include
 OPCODE_H_SCRIPT= $(srcdir)/Tools/scripts/generate_opcode_h.py
 OPCODE_H=       $(OPCODE_H_DIR)/opcode.h
 OPCODE_H_GEN=   $(PYTHON_FOR_GEN) $(OPCODE_H_SCRIPT) $(srcdir)/Lib/opcode.py $(OPCODE_H)
-#
+
 ##########################################################################
 # AST
 AST_H_DIR=      Include
 AST_H=          $(AST_H_DIR)/Python-ast.h
 AST_C_DIR=      Python
 AST_C=          $(AST_C_DIR)/Python-ast.c
 AST_ASDL=       $(srcdir)/Parser/Python.asdl
 
 ASDLGEN_FILES=  $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py
 # Note that a build now requires Python to exist before the build starts.
@@ skipping 55 matching lines @@
                 Python/getopt.o \
                 Python/pystrcmp.o \
                 Python/pystrtod.o \
                 Python/pystrhex.o \
                 Python/dtoa.o \
                 Python/formatter_unicode.o \
                 Python/fileutils.o \
                 Python/$(DYNLOADFILE) \
                 $(LIBOBJS) \
                 $(MACHDEP_OBJS) \
-                $(THREADOBJ)
+                $(THREADOBJ) \
+                $(DTRACE_OBJS)
 
 
 ##########################################################################
 # Objects
 OBJECT_OBJS=    \
                 Objects/abstract.o \
                 Objects/accu.o \
                 Objects/boolobject.o \
                 Objects/bytes_methods.o \
                 Objects/bytearrayobject.o \
@@ skipping 33 matching lines @@
                 Objects/weakrefobject.o
 
 ##########################################################################
 # objects that get linked into the Python library
 LIBRARY_OBJS_OMIT_FROZEN=       \
                 Modules/getbuildinfo.o \
                 $(PARSER_OBJS) \
                 $(OBJECT_OBJS) \
                 $(PYTHON_OBJS) \
                 $(MODULE_OBJS) \
-                $(SIGNAL_OBJS) \
                 $(MODOBJS)
 
 LIBRARY_OBJS=   \
                 $(LIBRARY_OBJS_OMIT_FROZEN) \
                 Python/frozen.o
+
+##########################################################################
+# DTrace
+
+# On some systems, object files that reference DTrace probes need to be modified
+# in-place by dtrace(1).
+DTRACE_DEPS = \
+        Python/ceval.o
+# XXX: should gcmodule, etc. be here, too?
 
 #########################################################################
 # Rules
 
 # Default target
 all:            @DEF_MAKE_ALL_RULE@
 build_all:      $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks Programs/_testembed python-config
 
 # Compile a binary with profile guided optimization.
 profile-opt:
@@ skipping 12 matching lines @@
         $(MAKE) build_all_merge_profile
         @echo "Rebuilding with profile guided optimizations:"
         $(MAKE) clean
         $(MAKE) build_all_use_profile
         $(MAKE) profile-removal
 
 build_all_generate_profile:
         $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LIBS="$(LIBS)"
 
 run_profile_task:
-        : # FIXME: can't run for a cross build
+        @ # FIXME: can't run for a cross build
         $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
 
 build_all_merge_profile:
         $(LLVM_PROF_MERGER)
 
 build_all_use_profile:
         $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_USE_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) @LTOFLAGS@"
 
 # Compile and run with gcov
 .PHONY=coverage coverage-lcov coverage-report
 coverage:
         @echo "Building with support for coverage checking:"
         $(MAKE) clean profile-removal
         $(MAKE) @DEF_MAKE_RULE@ CFLAGS="$(CFLAGS) -O0 -pg -fprofile-arcs -ftest-coverage" LIBS="$(LIBS) -lgcov"
 
 coverage-lcov:
         @echo "Creating Coverage HTML report with LCOV:"
         @rm -f $(COVERAGE_INFO)
         @rm -rf $(COVERAGE_REPORT)
         @lcov --capture --directory $(abs_builddir) \
             --base-directory $(realpath $(abs_builddir)) \
             --path $(realpath $(abs_srcdir)) \
             --output-file $(COVERAGE_INFO)
-        : # remove 3rd party modules and system headers
+        @ # remove 3rd party modules, system headers and internal files with
+        @ # debug, test or dummy functions.
         @lcov --remove $(COVERAGE_INFO) \
+            '*/Modules/_blake2/impl/*' \
             '*/Modules/_ctypes/libffi*/*' \
             '*/Modules/_decimal/libmpdec/*' \
+            '*/Modules/_sha3/kcp/*' \
             '*/Modules/expat/*' \
             '*/Modules/zlib/*' \
             '*/Include/*' \
+            '*/Modules/xx*.c' \
+            '*/Parser/listnode.c' \
+            '*/Python/pyfpe.c' \
+            '*/Python/pystrcmp.c' \
             '/usr/include/*' \
             '/usr/local/include/*' \
+            '/usr/lib/gcc/*' \
             --output-file $(COVERAGE_INFO)
         @genhtml $(COVERAGE_INFO) --output-directory $(COVERAGE_REPORT) \
             $(COVERAGE_REPORT_OPTIONS)
         @echo
         @echo "lcov report at $(COVERAGE_REPORT)/index.html"
         @echo
 
 coverage-report:
-        : # force rebuilding of parser and importlib
+        @ # force rebuilding of parser and importlib
         @touch $(GRAMMAR_INPUT)
         @touch $(srcdir)/Lib/importlib/_bootstrap.py
         @touch $(srcdir)/Lib/importlib/_bootstrap_external.py
-        : # build with coverage info
+        @ # build with coverage info
         $(MAKE) coverage
-        : # run tests, ignore failures
+        @ # run tests, ignore failures
         $(TESTRUNNER) $(TESTOPTS) || true
-        : # build lcov report
+        @ # build lcov report
         $(MAKE) coverage-lcov
 
 # Run "Argument Clinic" over all source files
 # (depends on python having already been built)
 .PHONY=clinic
 clinic: $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c
         $(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
 
 # Build the interpreter
 $(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
@@ skipping 42 matching lines @@
 
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS
 $(LIBRARY): $(LIBRARY_OBJS)
         -rm -f $@
         $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
         $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
         $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
         $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
-        $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
+        $(AR) $(ARFLAGS) $@ $(MODULE_OBJS)
         $(AR) $(ARFLAGS) $@ $(MODOBJS)
         $(RANLIB) $@
 
 libpython$(LDVERSION).so: $(LIBRARY_OBJS)
         if test $(INSTSONAME) != $(LDLIBRARY); then \
                 $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
                 $(LN) -f $(INSTSONAME) $@; \
         else \
                 $(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
         fi
@@ skipping 36 matching lines @@
         $(INSTALL) -d -m $(DIRMODE)  \
                 $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
         $(INSTALL_DATA) $(RESSRCDIR)/Info.plist \
                 $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/Info.plist
         $(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
         $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
         $(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
 
 # This rule builds the Cygwin Python DLL and import library if configured
 # for a shared core library; otherwise, this rule is a noop.
-$(DLLLIBRARY) libpython$(VERSION).dll.a: $(LIBRARY_OBJS)
+$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
         if test -n "$(DLLLIBRARY)"; then \
                 $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
                         $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
         else true; \
         fi
 
 
 oldsharedmods: $(SHAREDMODS)
 
 
@@ skipping 42 matching lines @@
             $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
 
 
 ############################################################################
 # Special rules for object files
 
 Modules/getbuildinfo.o: $(PARSER_OBJS) \
                 $(OBJECT_OBJS) \
                 $(PYTHON_OBJS) \
                 $(MODULE_OBJS) \
-                $(SIGNAL_OBJS) \
                 $(MODOBJS) \
                 $(srcdir)/Modules/getbuildinfo.c
         $(CC) -c $(PY_CORE_CFLAGS) \
               -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \
               -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \
               -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \
               -o $@ $(srcdir)/Modules/getbuildinfo.c
 
 Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
         $(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
@@ skipping 117 matching lines @@
 Objects/odictobject.o: $(srcdir)/Objects/dict-common.h
 Objects/dictobject.o: $(srcdir)/Objects/stringlib/eq.h $(srcdir)/Objects/dict-common.h
 Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h
 
 $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
         $(PYTHON_FOR_GEN) $(OPCODETARGETGEN) $(OPCODETARGETS_H)
 
 Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h
 
 Python/frozen.o: Python/importlib.h Python/importlib_external.h
+
+# Generate DTrace probe macros, then rename them (PYTHON_ -> PyDTrace_) to
+# follow our naming conventions. dtrace(1) uses the output filename to generate
+# an include guard, so we can't use a pipeline to transform its output.
+Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
+        $(DTRACE) $(DFLAGS) -o $@ -h -s $<
+        : sed in-place edit with POSIX-only tools
+        sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
+        mv $@.tmp $@
+
+Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
+        $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
 
 Objects/typeobject.o: Objects/typeslots.inc
 Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py
         $(PYTHON_FOR_GEN) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h Objects/typeslots.inc
 
 ############################################################################
 # Header files
 
 PYTHON_HEADERS= \
                 $(srcdir)/Include/Python.h \
@@ skipping 47 matching lines @@
                 $(srcdir)/Include/osdefs.h \
                 $(srcdir)/Include/osmodule.h \
                 $(srcdir)/Include/patchlevel.h \
                 $(srcdir)/Include/pgen.h \
                 $(srcdir)/Include/pgenheaders.h \
                 $(srcdir)/Include/pyarena.h \
                 $(srcdir)/Include/pyatomic.h \
                 $(srcdir)/Include/pycapsule.h \
                 $(srcdir)/Include/pyctype.h \
                 $(srcdir)/Include/pydebug.h \
+                $(srcdir)/Include/pydtrace.h \
                 $(srcdir)/Include/pyerrors.h \
                 $(srcdir)/Include/pyfpe.h \
                 $(srcdir)/Include/pyhash.h \
                 $(srcdir)/Include/pylifecycle.h \
                 $(srcdir)/Include/pymath.h \
                 $(srcdir)/Include/pygetopt.h \
                 $(srcdir)/Include/pymacro.h \
                 $(srcdir)/Include/pymem.h \
                 $(srcdir)/Include/pyport.h \
                 $(srcdir)/Include/pystate.h \
@@ skipping 11 matching lines @@
                 $(srcdir)/Include/symtable.h \
                 $(srcdir)/Include/sysmodule.h \
                 $(srcdir)/Include/traceback.h \
                 $(srcdir)/Include/tupleobject.h \
                 $(srcdir)/Include/ucnhash.h \
                 $(srcdir)/Include/unicodeobject.h \
                 $(srcdir)/Include/warnings.h \
                 $(srcdir)/Include/weakrefobject.h \
                 pyconfig.h \
                 $(PARSER_HEADERS) \
-                $(AST_H)
+                $(AST_H) \
+                $(DTRACE_HEADERS)
 
 $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS)
 
 
 ######################################################################
 
 TESTOPTS=       $(EXTRATESTOPTS)
 TESTPYTHON=     $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS)
 TESTRUNNER=     $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
-TESTTIMEOUT=    900
+TESTTIMEOUT=    1200
 
 # Run a basic set of regression tests.
 # This excludes some tests that are particularly resource-intensive.
 test:           all platform
                 $(TESTRUNNER) $(TESTOPTS)
 
 # Run the full test suite twice - once without .pyc files, and once with.
 # In the past, we've had problems where bugs in the marshalling or
 # elsewhere caused bytecode read from .pyc files to behave differently
 # than bytecode generated directly from a .py source file.  Sometimes
 # the bytecode read from a .pyc file had the bug, sometimes the directly
 # generated bytecode.  This is sometimes a very shy bug needing a lot of
 # sample data.
 testall:        all platform
                 -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
                 $(TESTPYTHON) -E $(srcdir)/Lib/compileall.py
                 -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
                 -$(TESTRUNNER) -u all $(TESTOPTS)
                 $(TESTRUNNER) -u all $(TESTOPTS)
 
 # Run the test suite for both architectures in a Universal build on OSX.
 # Must be run on an Intel box.
 testuniversal:  all platform
-                if [ `arch` != 'i386' ];then \
+                @if [ `arch` != 'i386' ]; then \
                         echo "This can only be used on OSX/i386" ;\
                         exit 1 ;\
                 fi
                 $(TESTRUNNER) -u all $(TESTOPTS)
                 $(RUNSHARED) /usr/libexec/oah/translate \
                         ./$(BUILDPYTHON) -E -m test -j 0 -u all $(TESTOPTS)
 
 # Like testall, but with only one pass and without multiple processes.
 # Run an optional script to include information about the build environment.
-buildbottest:   all platform
+buildbottest:   build_all platform
                 -@if which pybuildbot.identify >/dev/null 2>&1; then \
                         pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \
                 fi
                 $(TESTRUNNER) -j 1 -u all -W --slowest --timeout=$(TESTTIMEOUT) $(TESTOPTS)
 
 QUICKTESTOPTS=  $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
                 test_multibytecodec test_urllib2_localnet test_itertools \
                 test_multiprocessing_fork test_multiprocessing_spawn \
                 test_multiprocessing_forkserver \
                 test_mailbox test_socket test_poll \
@@ skipping 142 matching lines @@
         -rm -f $(DESTDIR)$(MANDIR)/man1/python3.1
         (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python3.1)
 
 # Install the library
 XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
 LIBSUBDIRS=     tkinter tkinter/test tkinter/test/test_tkinter \
                 tkinter/test/test_ttk site-packages test \
                 test/audiodata \
                 test/capath test/data \
                 test/cjkencodings test/decimaltestdata test/xmltestdata \
+                test/dtracedata \
                 test/eintrdata \
                 test/imghdrdata \
                 test/libregrtest \
                 test/subprocessdata test/sndhdrdata test/support \
                 test/tracedmodules test/encoded_modules \
                 test/test_import \
                 test/test_import/data \
                 test/test_import/data/circular_imports \
                 test/test_import/data/circular_imports/subpkg \
                 test/test_importlib/namespace_pkgs \
@@ skipping 89 matching lines @@
                                     $(INSTALL_SCRIPT) $$i $(DESTDIR)$$b; \
                                 else \
                                     echo $(INSTALL_DATA) $$i $$b; \
                                     $(INSTALL_DATA) $$i $(DESTDIR)$$b; \
                                 fi;; \
                         esac; \
                 done; \
         done
         $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
                 $(DESTDIR)$(LIBDEST); \
-        echo $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS).py \
-                $(LIBDEST)
         $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
         if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
                 $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
                         $(DESTDIR)$(LIBDEST)/distutils/tests ; \
         fi
         -PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
                 $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
                 -d $(LIBDEST) -f \
                 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
                 $(DESTDIR)$(LIBDEST)
@@ skipping 18 matching lines @@
         -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                 $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
                 -d $(LIBDEST)/site-packages -f \
                 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
         -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
         -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
 
 python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
-        # Substitution happens here, as the completely-expanded BINDIR
-        # is not available in configure
+        @ # Substitution happens here, as the completely-expanded BINDIR
+        @ # is not available in configure
         sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
-        # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
-        sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config
-        # On Darwin, always use the python version of the script, the shell
-        # version doesn't use the compiler customizations that are provided
-        # in python (_osx_support.py).
-        if test `uname -s` = Darwin; then \
+        @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
+        LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config
+        @ # On Darwin, always use the python version of the script, the shell
+        @ # version doesn't use the compiler customizations that are provided
+        @ # in python (_osx_support.py).
+        @if test `uname -s` = Darwin; then \
                 cp python-config.py python-config; \
         fi
 
 
 # Install the include files
 INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
 inclinstall:
         @for i in $(INCLDIRSTOMAKE); \
         do \
                 if test ! -d $(DESTDIR)$$i; then \
@@ skipping 66 matching lines @@
         fi
 
 # Install the dynamically loadable modules
 # This goes into $(exec_prefix)
 sharedinstall: sharedmods
         $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
                 --prefix=$(prefix) \
                 --install-scripts=$(BINDIR) \
                 --install-platlib=$(DESTSHARED) \
                 --root=$(DESTDIR)/
-        -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS).py
+        -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
         -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
 
 # Here are a couple of targets for MacOSX again, to install a full
 # framework-based Python. frameworkinstall installs everything, the
 # subtargets install specific parts. Much of the actual work is offloaded to
 # the Makefile in Mac
 #
 #
 # This target is here for backward compatibility, previous versions of Python
 # hadn't integrated framework installation in the normal install process.
@@ skipping 143 matching lines @@
         find . -name '*.[oa]' -exec rm -f {} ';'
         find . -name '*.s[ol]' -exec rm -f {} ';'
         find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
         find build -name 'fficonfig.h' -exec rm -f {} ';' || true
         find build -name '*.py' -exec rm -f {} ';' || true
         find build -name '*.py[co]' -exec rm -f {} ';' || true
         -rm -f pybuilddir.txt
         -rm -f Lib/lib2to3/*Grammar*.pickle
         -rm -f Programs/_testembed Programs/_freeze_importlib
         -find build -type f -a ! -name '*.gc??' -exec rm -f {} ';'
+        -rm -f Include/pydtrace_probes.h
 
 profile-removal:
         find . -name '*.gc??' -exec rm -f {} ';'
         find . -name '*.profclang?' -exec rm -f {} ';'
         find . -name '*.dyn' -exec rm -f {} ';'
         rm -f $(COVERAGE_INFO)
         rm -rf $(COVERAGE_REPORT)
 
 clobber: clean profile-removal
         -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
                 tags TAGS \
                 config.cache config.log pyconfig.h Modules/config.c
         -rm -rf build platform
         -rm -rf $(PYTHONFRAMEWORKDIR)
         -rm -f python-config.py python-config
 
 # Make things extra clean, before making a distribution:
 # remove all generated files, even Makefile[.pre]
 # Keep configure and Python-ast.[ch], it's possible they can't be generated
 distclean: clobber
         for file in $(srcdir)/Lib/test/data/* ; do \
             if test "$$file" != "$(srcdir)/Lib/test/data/README"; then rm "$$file"; fi; \
         done
         -rm -f core Makefile Makefile.pre config.status \
                 Modules/Setup Modules/Setup.local Modules/Setup.config \
                 Modules/ld_so_aix Modules/python.exp Misc/python.pc
         -rm -f python*-gdb.py
-        find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \
+        # Issue #28258: set LC_ALL to avoid issues with Estonian locale.
+        # Expansion is performed here by shell (spawned by make) itself before
+        # arguments are passed to find. So LC_ALL=C must be set as a separate
+        # command.
+        LC_ALL=C; find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \
                                      -o -name '[@,#]*' -o -name '*.old' \
                                      -o -name '*.orig' -o -name '*.rej' \
                                      -o -name '*.bak' ')' \
                                      -exec rm -f {} ';'
 
 # Check for smelly exported symbols (not starting with Py/_Py)
 smelly: all
         nm -p $(LIBRARY) | \
                 sed -n "/ [TDB] /s/.* //p" | grep -v "^_*Py" | sort -u; \
 
@@ skipping 44 matching lines @@
 .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
 .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
 .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
 .PHONY: smelly funny patchcheck touch altmaninstall commoninstall
 .PHONY: gdbhooks
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # Local Variables:
 # mode: makefile
 # End: