diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2012-02-15 19:56:07 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-02-15 19:56:07 +0000 |
| commit | 2a5d011c41e8fe384dd5f638ea665b805aef0030 (patch) | |
| tree | b836a2e7d04d9c84b7355078fd9211e99fc38cf2 /libstdc++-v3/python | |
| parent | 6017aed3043a62f0cc5f0e20804fd0913addc6be (diff) | |
| download | gcc-2a5d011c41e8fe384dd5f638ea665b805aef0030.zip gcc-2a5d011c41e8fe384dd5f638ea665b805aef0030.tar.gz gcc-2a5d011c41e8fe384dd5f638ea665b805aef0030.tar.bz2 | |
re PR libstdc++/51368 (libstdc++ python pretty printers should use --with-python-dir just like libjava)
2012-02-15 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/51368
* acinclude.m4 (GLIBCXX_ENABLE_PYTHON): New.
* configure.ac: Use it.
* python/Makefile.am: Same.
* configure: Regenerate.
* python/Makefile.in: Regenerate.
* Makefile.in: Same.
* doc/Makefile.in: Same.
* include/Makefile.in: Same.
* po/Makefile.in: Same.
* src/Makefile.in: Same.
* src/c++11/Makefile.in: Same.
* src/c++98/Makefile.in: Same.
* testsuite/Makefile.in: Same.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184282
Diffstat (limited to 'libstdc++-v3/python')
| -rw-r--r-- | libstdc++-v3/python/Makefile.am | 6 | ||||
| -rw-r--r-- | libstdc++-v3/python/Makefile.in | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/python/Makefile.am b/libstdc++-v3/python/Makefile.am index 457e45b..49d8f86 100644 --- a/libstdc++-v3/python/Makefile.am +++ b/libstdc++-v3/python/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the python subdirectory of the GNU C++ Standard library. ## -## Copyright (C) 2009 Free Software Foundation, Inc. +## Copyright (C) 2009, 2012 Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. ## Process this file with automake to produce Makefile.in. @@ -24,7 +24,11 @@ include $(top_srcdir)/fragment.am ## Where to install the module code. +if ENABLE_PYTHONDIR +pythondir = $(prefix)/$(python_mod_dir) +else pythondir = $(datadir)/gcc-$(gcc_version)/python +endif all-local: gdb.py diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in index 20d7417..7dde04f 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -262,6 +262,7 @@ port_specific_symbol_files = @port_specific_symbol_files@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +python_mod_dir = @python_mod_dir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -297,7 +298,8 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -pythondir = $(datadir)/gcc-$(gcc_version)/python +@ENABLE_PYTHONDIR_FALSE@pythondir = $(datadir)/gcc-$(gcc_version)/python +@ENABLE_PYTHONDIR_TRUE@pythondir = $(prefix)/$(python_mod_dir) nobase_python_DATA = \ libstdcxx/v6/printers.py \ libstdcxx/v6/__init__.py \ |