diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2015-04-13 19:55:08 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2015-04-13 19:55:08 (GMT) |
| commit | 9e7ece271f37670a780ccdcd1c73019fde453d50 (patch) | |
| tree | 4f19e4d10056cf90005877a5dd2536acf61eef53 | |
| parent | 10657c08cbc613920e10ee44077f8ca71d0ca889 (diff) | |
| download | cpython-9e7ece271f37670a780ccdcd1c73019fde453d50.zip cpython-9e7ece271f37670a780ccdcd1c73019fde453d50.tar.gz cpython-9e7ece271f37670a780ccdcd1c73019fde453d50.tar.bz2 | |
- Use PLATDIR for the platform directory everywhere (refactoring only)
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Modules/Setup.dist | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 7f4ec2f..b3b2b36 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -946,7 +946,7 @@ maninstall: altmaninstall (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python2.1 python.1) # Install the library -PLATDIR= plat-$(MACHDEP) +PLATDIR= @PLATDIR@ EXTRAPLATDIR= @EXTRAPLATDIR@ EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@ MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR) diff --git a/Modules/Setup.dist b/Modules/Setup.dist index 2ad1aa3..523e05a 100644 --- a/Modules/Setup.dist +++ b/Modules/Setup.dist @@ -91,7 +91,7 @@ SITEPATH= TESTPATH= # Path components for machine- or system-dependent modules and shared libraries -MACHDEPPATH=:plat-$(MACHDEP) +MACHDEPPATH=:$(PLATDIR) EXTRAMACHDEPPATH= # Path component for the Tkinter-related modules diff --git a/configure.ac b/configure.ac index d33df2a..78fe3c7 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) fi AC_MSG_RESULT($interp) - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp fi elif test "$cross_compiling" = maybe; then AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) @@ -493,6 +493,9 @@ then fi AC_MSG_RESULT($MACHDEP) +AC_SUBST(PLATDIR) +PLATDIR=plat-$MACHDEP + # And add extra plat-mac for darwin AC_SUBST(EXTRAPLATDIR) AC_SUBST(EXTRAMACHDEPPATH) |