From e6010061fca5cae4483b9f7ffab9d955343a20fe Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Fri, 17 Feb 2012 22:10:38 +1000 Subject: [PATCH] Implement PEP 394 for Python 2.7 --- Makefile.pre.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index c44bf1bb6c6..340da247621 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -786,18 +786,26 @@ $(DESTSHARED): done -# Install the interpreter (by creating a hard link to python$(VERSION)) +# Install the interpreter by creating a symlink chain: +# $(PYTHON) -> python2 -> python$(VERSION)) +# Also create equivalent chains for other installed files bininstall: altbininstall -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \ then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ else true; \ fi - (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)) + (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) + -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE) + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE)) + -rm -f $(DESTDIR)$(BINDIR)/python2-config + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config) -rm -f $(DESTDIR)$(BINDIR)/python-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) + (cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config) -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) + -rm -f $(DESTDIR)$(LIBPC)/python2.pc + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc) -rm -f $(DESTDIR)$(LIBPC)/python.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python.pc) + (cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc) # Install the interpreter with $(VERSION) affixed # This goes into $(exec_prefix)