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.
diff --git a/Lib/test/subprocessdata/input_reader.py b/Lib/test/subprocessdata/input_reader.py
index ccae5f3..1dc3191 100644
--- a/Lib/test/subprocessdata/input_reader.py
+++ b/Lib/test/subprocessdata/input_reader.py
@@ -2,6 +2,6 @@
import sys
-if __name__ = "__main__":
+if __name__ == "__main__":
for line in sys.stdin:
pass
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 @@
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 @@
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 @@
.PHONY: gdbhooks
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+# Local Variables:
+# mode: makefile
+# End: