From de72019725541ce15ddaae55539a9413ce67144c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 18 Dec 2022 08:33:36 +0100
Subject: [PATCH] pythongh-100221: Fix creating dirs in `make sharedinstall`

Fix creating install directories in `make sharedinstall` if they exist
already outside `DESTDIR`.  The previous make rules assumed that
the directories would be created via a dependency on a rule
for `$(DESTSHARED)` that did not fire if the directory did exist outside
`$(DESTDIR)`.

While technically `$(DESTDIR)` could be prepended to the rule name,
moving the rules for creating directories straight into
the `sharedinstall` rule seems to fit the common practices better.
Since the rule explicitly checks whether the individual directories
exist anyway, there seems to be no reason to rely on make determining
that implicitly as well.
---
 Makefile.pre.in                               | 21 ++++++++-----------
 Misc/ACKS                                     |  1 +
 ...-12-18-08-33-28.gh-issue-100221.K94Ct3.rst |  2 ++
 3 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Build/2022-12-18-08-33-28.gh-issue-100221.K94Ct3.rst

diff --git a/Makefile.pre.in b/Makefile.pre.in
index dd6c3fbd1c6483..75cc5f0e235015 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1803,7 +1803,15 @@ commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
 # Install shared libraries enabled by Setup
 DESTDIRS=	$(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
 
-sharedinstall: $(DESTSHARED) all
+sharedinstall: all
+		@for i in $(DESTDIRS); \
+		do \
+			if test ! -d $(DESTDIR)$$i; then \
+				echo "Creating directory $$i"; \
+				$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
+			else    true; \
+			fi; \
+		done
 		@for i in X $(SHAREDMODS); do \
 		  if test $$i != X; then \
 		    echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
@@ -1815,17 +1823,6 @@ sharedinstall: $(DESTSHARED) all
 		  fi; \
 		done
 
-
-$(DESTSHARED):
-		@for i in $(DESTDIRS); \
-		do \
-			if test ! -d $(DESTDIR)$$i; then \
-				echo "Creating directory $$i"; \
-				$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
-			else    true; \
-			fi; \
-		done
-
 # Install the interpreter with $(VERSION) affixed
 # This goes into $(exec_prefix)
 altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
diff --git a/Misc/ACKS b/Misc/ACKS
index d50cb3c2d1ee4f..169afc6eb383e4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -640,6 +640,7 @@ Tiago Gonçalves
 Chris Gonnerman
 Shelley Gooch
 David Goodger
+Michał Górny
 Elliot Gorokhovsky
 Hans de Graaff
 Tim Graham
diff --git a/Misc/NEWS.d/next/Build/2022-12-18-08-33-28.gh-issue-100221.K94Ct3.rst b/Misc/NEWS.d/next/Build/2022-12-18-08-33-28.gh-issue-100221.K94Ct3.rst
new file mode 100644
index 00000000000000..27c948330cfc17
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-12-18-08-33-28.gh-issue-100221.K94Ct3.rst
@@ -0,0 +1,2 @@
+Fix creating install directories in ``make sharedinstall`` if they exist
+outside ``DESTDIR`` already.