From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 19 May 2020 16:13:15 +0000 (-0700)
Subject: bpo-40683: Add zoneinfo to LIBSUBDIRS (GH-20229)
X-Git-Tag: v3.9.0b2~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5bd4358fc2dea2e7c84d0c56974627fc43217cd;p=thirdparty%2FPython%2Fcpython.git

bpo-40683: Add zoneinfo to LIBSUBDIRS (GH-20229)


Without this, only the _zoneinfo module is getting installed, not the
zoneinfo module. I believe this was not noticed earlier because
test.test_zoneinfo was also not being installed.
(cherry picked from commit 2abededbc4165d2daa14ae9d74b1f33cce0593d7)

Co-authored-by: Paul Ganssle <paul@ganssle.io>
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index de50f6b7f702..5a18704e4419 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1429,6 +1429,7 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 		test/test_importlib/source \
 		test/test_importlib/zipdata01 \
 		test/test_importlib/zipdata02 \
+		test/test_zoneinfo test/test_zoneinfo/data \
 		test/ziptestdata \
 		asyncio \
 		test/test_asyncio \
@@ -1450,7 +1451,8 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 		multiprocessing multiprocessing/dummy \
 		unittest unittest/test unittest/test/testmock \
 		venv venv/scripts venv/scripts/common venv/scripts/posix \
-		curses pydoc_data
+		curses pydoc_data \
+		zoneinfo
 libinstall:	build_all $(srcdir)/Modules/xxmodule.c
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
diff --git a/Misc/NEWS.d/next/Build/2020-05-19-10-54-08.bpo-40683.W8JHrr.rst b/Misc/NEWS.d/next/Build/2020-05-19-10-54-08.bpo-40683.W8JHrr.rst
new file mode 100644
index 000000000000..d57e064c03d6
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2020-05-19-10-54-08.bpo-40683.W8JHrr.rst
@@ -0,0 +1,2 @@
+Fixed an issue where the :mod:`zoneinfo` module and its tests were not
+included when Python is installed with ``make``.