Commit 866a55b5 authored by Neil Schemenauer's avatar Neil Schemenauer

Change EXEEXT back to EXE in the Makefile. Other tools may depend on the name.

The name in configure is still EXEEXT because that's what autoconf calls it.
Also, replace a few occurrences of "python" with "$(PYTHON)".
parent d2705225
...@@ -97,7 +97,7 @@ BLDSHARED= @BLDSHARED@ ...@@ -97,7 +97,7 @@ BLDSHARED= @BLDSHARED@
DESTSHARED= $(BINLIBDEST)/lib-dynload DESTSHARED= $(BINLIBDEST)/lib-dynload
# Executable suffix (.exe on Windows and Mac OS X) # Executable suffix (.exe on Windows and Mac OS X)
EXEEXT= @EXEEXT@ EXE= @EXEEXT@
# Modes for directories, executables and data files created by the # Modes for directories, executables and data files created by the
# install process. Default to user-only-writable for all file types. # install process. Default to user-only-writable for all file types.
...@@ -139,7 +139,7 @@ LIBOBJS= @LIBOBJS@ ...@@ -139,7 +139,7 @@ LIBOBJS= @LIBOBJS@
DLINCLDIR= @DLINCLDIR@ DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@ DYNLOADFILE= @DYNLOADFILE@
PYTHON= python$(EXEEXT) PYTHON= python$(EXE)
# === Definitions added by makesetup === # === Definitions added by makesetup ===
...@@ -164,7 +164,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar ...@@ -164,7 +164,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
########################################################################## ##########################################################################
# Parser # Parser
PGEN= Parser/pgen$(EXEEXT) PGEN= Parser/pgen$(EXE)
POBJS= \ POBJS= \
Parser/acceler.o \ Parser/acceler.o \
...@@ -507,7 +507,7 @@ bininstall: altbininstall ...@@ -507,7 +507,7 @@ bininstall: altbininstall
then rm -f $(BINDIR)/$(PYTHON); \ then rm -f $(BINDIR)/$(PYTHON); \
else true; \ else true; \
fi fi
(cd $(BINDIR); $(LN) python$(VERSION)$(EXEEXT) python$(EXEEXT)) (cd $(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
# Install the interpreter with $(VERSION) affixed # Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
...@@ -520,7 +520,7 @@ altbininstall: $(PYTHON) ...@@ -520,7 +520,7 @@ altbininstall: $(PYTHON)
else true; \ else true; \
fi; \ fi; \
done done
$(INSTALL_PROGRAM) $(PYTHON) $(BINDIR)/python$(VERSION)$(EXEEXT) $(INSTALL_PROGRAM) $(PYTHON) $(BINDIR)/python$(VERSION)$(EXE)
if test -f libpython$(VERSION).so; then \ if test -f libpython$(VERSION).so; then \
$(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \ $(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \
else true; \ else true; \
...@@ -549,7 +549,7 @@ MACHDEPS= $(PLATDIR) ...@@ -549,7 +549,7 @@ MACHDEPS= $(PLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/parsers xml/sax XMLLIBSUBDIRS= xml xml/dom xml/parsers xml/sax
LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \
distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS) distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS)
libinstall: python $(srcdir)/Lib/$(PLATDIR) libinstall: $(PYTHON) $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
if test ! -d $$i; then \ if test ! -d $$i; then \
...@@ -615,7 +615,7 @@ $(srcdir)/Lib/$(PLATDIR): ...@@ -615,7 +615,7 @@ $(srcdir)/Lib/$(PLATDIR):
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
export PATH; PATH="`pwd`:$$PATH"; \ export PATH; PATH="`pwd`:$$PATH"; \
export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
export EXEEXT; EXEEXT="$(EXEEXT)"; \ export EXE; EXE="$(EXE)"; \
cd $(srcdir)/Lib/$(PLATDIR); ./regen cd $(srcdir)/Lib/$(PLATDIR); ./regen
# Install the include files # Install the include files
...@@ -692,7 +692,7 @@ libainstall: all ...@@ -692,7 +692,7 @@ libainstall: all
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
sharedinstall: sharedinstall:
PYTHONPATH= ./python$(EXEEXT) $(srcdir)/setup.py install \ PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py install \
--install-platlib=$(DESTSHARED) --install-platlib=$(DESTSHARED)
# Build the toplevel Makefile # Build the toplevel Makefile
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment