From: Barry Warsaw <barry@python.org>
Date: Sat, 11 Dec 2010 21:32:01 +0000 (+0000)
Subject: Create the hardlink between python-3.2m and python-3.2 in altbininstall target
X-Git-Tag: v3.2b2~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad6f877f9899ba6ae7990eb4f090e7ac97bfa7d7;p=thirdparty%2FPython%2Fcpython.git

Create the hardlink between python-3.2m and python-3.2 in altbininstall target
instead of bininstall target so it shows up when you do 'make altinstall'.
Closes issue 10677.
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 67a74b90014a..4c7c28bc9cce 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -836,6 +836,11 @@ 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; \
+	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); \
@@ -853,11 +858,6 @@ 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