diff options
| author | Thomas Wouters <thomas@python.org> | 2007-09-10 19:32:14 +0000 |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2007-09-10 19:32:14 +0000 |
| commit | bca548061a53fc5d6c2ad437a59476e622ac595d (patch) | |
| tree | 8dcb4e03eac1762ac7900f24c9a7795ad6208eba /Makefile.pre.in | |
| parent | 8f95067915fc1cd74c8ef31fccc84796cd45fff3 (diff) | |
| download | cpython-git-bca548061a53fc5d6c2ad437a59476e622ac595d.tar.gz | |
Merged revisions 58053-58090 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58061 | ronald.oussoren | 2007-09-09 13:13:42 +0200 (Sun, 09 Sep 2007) | 12 lines
Newer autoconf versions (from 2.60) want a 'datarootdir' definition in
(Make-)files that use mandir (and other data directory macros).
This patch solves a warning during configure, specifically:
...
config.status: creating Makefile.pre
config.status: WARNING: ../Makefile.pre.in seems to ignore the --datarootdir setting
...
See also: <http://www.gnu.org/software/automake/manual/autoconf/Changed-Directory-Variables.html>
........
r58064 | gregory.p.smith | 2007-09-09 22:25:00 +0200 (Sun, 09 Sep 2007) | 2 lines
email address update
........
r58067 | gregory.p.smith | 2007-09-10 01:36:46 +0200 (Mon, 10 Sep 2007) | 22 lines
Change socket.error to inherit from IOError rather than being a stand
alone class. This addresses the primary concern in
http://bugs.python.org/issue1706815
python-dev discussion here:
http://mail.python.org/pipermail/python-dev/2007-July/073749.html
I chose IOError rather than EnvironmentError as the base class since
socket objects are often used as transparent duck typed file objects
in code already prepared to deal with IOError exceptions.
also a minor fix:
urllib2 - fix a couple places where IOError was raised rather than URLError.
for better or worse, URLError already inherits from IOError so
this won't break any existing code.
test_urllib2net - replace bad ftp urls.
........
r58084 | martin.v.loewis | 2007-09-10 08:18:32 +0200 (Mon, 10 Sep 2007) | 3 lines
tr a-z A-Z does not work on Solaris (would require
/usr/xpg4/bin/tr); make the character ranges explicit.
........
r58086 | martin.v.loewis | 2007-09-10 12:21:22 +0200 (Mon, 10 Sep 2007) | 1 line
Take chm file from build/htmlhelp/pydoc.chm.
........
r58087 | martin.v.loewis | 2007-09-10 12:22:05 +0200 (Mon, 10 Sep 2007) | 1 line
Beginnings of a "build MSI" step.
........
r58088 | martin.v.loewis | 2007-09-10 15:19:10 +0200 (Mon, 10 Sep 2007) | 1 line
Allow making update with no prior checkout.
........
r58089 | martin.v.loewis | 2007-09-10 15:20:03 +0200 (Mon, 10 Sep 2007) | 1 line
Update before making htmlhelp.
........
r58090 | martin.v.loewis | 2007-09-10 15:30:38 +0200 (Mon, 10 Sep 2007) | 1 line
Require that bash.exe is on the path, along with the rest of Cygwin.
........
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index aa280c0d08..2e0352741a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -82,6 +82,9 @@ prefix= @prefix@ # Install prefix for architecture-dependent files exec_prefix= @exec_prefix@ +# Install prefix for data files +datarootdir= @datarootdir@ + # Expanded directories BINDIR= $(exec_prefix)/bin LIBDIR= $(exec_prefix)/lib |