Change the python3 hardlink to a symlink, and correct some misuse of the PYTHON var...

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 07aa5bfeb67d767c93521f71d4638d78d9d3587b..46f461ad2bfdab12a27f43f1cc009ab679f829cb 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -858,7 +858,7 @@ altbininstall: $(BUILDPYTHON)
        done
        $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE)
        -if test "$(VERSION)" != "$(LDVERSION)"; then \
-               if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)$(VERSION)$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)$(VERSION)$(EXE); \
+               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)); \
@@ -879,11 +879,11 @@ altbininstall: $(BUILDPYTHON)
        fi
 
 bininstall: altbininstall
-       -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \
-       then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \
+       -if test -f $(DESTDIR)$(BINDIR)/python3$(EXE) -o -h $(DESTDIR)$(BINDIR)/python3$(EXE); \
+       then rm -f $(DESTDIR)$(BINDIR)/python3$(EXE); \
        else true; \
        fi
-       (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)3$(EXE))
+       (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
        -if test "$(VERSION)" != "$(LDVERSION)"; then \
                rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
                (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \