summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2012-02-17 13:17:34 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2012-02-17 13:17:34 (GMT)
commit4fcad3c7ab551110bce65fdac3b8e914dff1aa5c (patch)
treecaf2b7d498ea8e5fff17fb50636389a8528af7bb
parente9fccb360f872ffdac1d3c2937f8e4c995ab1149 (diff)
downloadcpython-4fcad3c7ab551110bce65fdac3b8e914dff1aa5c.zip
cpython-4fcad3c7ab551110bce65fdac3b8e914dff1aa5c.tar.gz
cpython-4fcad3c7ab551110bce65fdac3b8e914dff1aa5c.tar.bz2
Change the python3 hardlink to a symlink, and correct some misuse of the PYTHON var in the makefile
-rw-r--r--Makefile.pre.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 07aa5bf..46f461a 100644
--- 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); \