From: Georg Brandl <georg@python.org>
Date: Wed, 19 May 2010 00:10:00 +0000 (+0000)
Subject: Merged revisions 72787 via svnmerge from
X-Git-Tag: v2.6.6rc1~298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9078bc6f9a0aa7beed28312270bb360db32f5e4a;p=python

Merged revisions 72787 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72787 | ronald.oussoren | 2009-05-19 19:06:38 +0000 (Di, 19 Mai 2009) | 8 lines

  This patch ensures that the pydoc_data package gets installed. This is needed
  to make it possible to use pydoc to get access to the language reference.

  That is, without this patch the folllowing won't work:

     >>> help('if')
........
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5e37f36da6..da515be025 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -829,7 +829,7 @@ LIBSUBDIRS=	lib-tk site-packages test test/output test/data \
 		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
 		multiprocessing multiprocessing/dummy \
 		lib-old \
-		curses $(MACHDEPS)
+		curses pydoc_data $(MACHDEPS)
 libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \