diff options
| author | Barry Warsaw <barry@python.org> | 2010-11-24 19:43:47 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2010-11-24 19:43:47 (GMT) |
| commit | 14d98ac31b9f4e5b89284271f03fb77fc81ab624 (patch) | |
| tree | 2f784cc5d4b814b41c4d14f2f308e1173c938e58 /Makefile.pre.in | |
| parent | fdba067213f1881632f9f1b7b4fce53cf88bbe28 (diff) | |
| download | cpython-14d98ac31b9f4e5b89284271f03fb77fc81ab624.zip cpython-14d98ac31b9f4e5b89284271f03fb77fc81ab624.tar.gz cpython-14d98ac31b9f4e5b89284271f03fb77fc81ab624.tar.bz2 | |
Final patch for issue 9807.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index ab72fca..c605b21 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -108,9 +108,8 @@ ABIFLAGS= @ABIFLAGS@ # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) LIBDEST= $(SCRIPTDIR)/python$(VERSION) -INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) -CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) -LIBP= $(LIBDIR)/python$(VERSION) +INCLUDEPY= $(INCLUDEDIR)/python$(LDVERSION) +CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) # Symbols used for using shared libraries SO= @SO@ @@ -834,7 +833,7 @@ altbininstall: $(BUILDPYTHON) else true; \ fi; \ done - $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE) + $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE) if test -f $(LDLIBRARY); then \ if test -n "$(DLLLIBRARY)" ; then \ $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ @@ -852,11 +851,20 @@ bininstall: altbininstall then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \ else true; \ fi + -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)$(VERSION)$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)$(VERSION)$(EXE); \ + then rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \ + else true; \ + fi + (cd $(DESTDIR)$(BINDIR); $(LN) python$(LDVERSION)$(EXE) python$(VERSION)$(EXE)) (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)3$(EXE)) -rm -f $(DESTDIR)$(BINDIR)/python3-config + -rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config) (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) -rm -f $(DESTDIR)$(LIBPC)/python3.pc + -rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc) + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc) # Install the manual page maninstall: @@ -986,7 +994,7 @@ $(srcdir)/Lib/$(PLATDIR): python-config: $(srcdir)/Misc/python-config.in # Substitution happens here, as the completely-expanded BINDIR # is not available in configure - sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config + sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config # Install the include files INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) @@ -1008,13 +1016,13 @@ inclinstall: # Install the library and miscellaneous stuff needed for extending/embedding # This goes into $(exec_prefix) -LIBPL= $(LIBP)/config +LIBPL= $(LIBDEST)/config-$(LDVERSION) # pkgconfig directory LIBPC= $(LIBDIR)/pkgconfig libainstall: all python-config - @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \ + @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \ do \ if test ! -d $(DESTDIR)$$i; then \ echo "Creating directory $$i"; \ @@ -1044,7 +1052,7 @@ libainstall: all python-config $(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config + $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config rm python-config @if [ -s Modules/python.exp -a \ "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ |