diff options
| author | Barry Warsaw <barry@python.org> | 2010-12-13 18:04:23 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2010-12-13 18:04:23 (GMT) |
| commit | 771d33e1134111a041df78acf7761a9f015d4ea5 (patch) | |
| tree | c60b8be80d3a669597aed8d13280423588ec0666 /Makefile.pre.in | |
| parent | e98e8a3aa8da93edd3bcd71fcbd1eb1874deb7f6 (diff) | |
| download | cpython-771d33e1134111a041df78acf7761a9f015d4ea5.zip cpython-771d33e1134111a041df78acf7761a9f015d4ea5.tar.gz cpython-771d33e1134111a041df78acf7761a9f015d4ea5.tar.bz2 | |
Issue 10687. When --without-pymalloc is given, $VERSION is the same as
$LDVERSION, which screws up the sym/hard-links. This avoids those games when
$VERSION == $LDVERSION.
Also, include a drive-by fix for an obvious syntax error.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 4ce952f..edbb7dd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -836,11 +836,12 @@ altbininstall: $(BUILDPYTHON) fi; \ done $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE) - -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; \ + -if test "$(VERSION)" != "$(LDVERSION)"; then \ + if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)$(VERSION)$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)$(VERSION)$(EXE); \ + then rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \ + fi; \ + (cd $(DESTDIR)$(BINDIR); $(LN) python$(LDVERSION)$(EXE) python$(VERSION)$(EXE)); \ fi - (cd $(DESTDIR)$(BINDIR); $(LN) python$(LDVERSION)$(EXE) python$(VERSION)$(EXE)) if test -f $(LDLIBRARY); then \ if test -n "$(DLLLIBRARY)" ; then \ $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ @@ -859,14 +860,16 @@ bininstall: altbininstall else true; \ fi (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)3$(EXE)) + -if test "$(VERSION)" != "$(LDVERSION)"; then \ + rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ + rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ + fi -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: @@ -1307,3 +1310,6 @@ Python/thread.o: @THREADHEADERS@ .PHONY: gdbhooks # IF YOU PUT ANYTHING HERE IT WILL GO AWAY +# Local Variables: +# mode: makefile +# End: |