[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.24,1.25

[Neil Schemenauer]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv25352

Modified Files:
	Makefile.pre.in 
Log Message:
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)".


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** Makefile.pre.in	2001/02/27 04:45:05	1.24
--- Makefile.pre.in	2001/02/27 18:50:56	1.25
***************
*** 98,102 ****
  
  # Executable suffix (.exe on Windows and Mac OS X)
! EXEEXT=		@EXEEXT@
  
  # Modes for directories, executables and data files created by the
--- 98,102 ----
  
  # Executable suffix (.exe on Windows and Mac OS X)
! EXE=		@EXEEXT@
  
  # Modes for directories, executables and data files created by the
***************
*** 140,144 ****
  DYNLOADFILE=	@DYNLOADFILE@
  
! PYTHON=		python$(EXEEXT)
  
  # === Definitions added by makesetup ===
--- 140,144 ----
  DYNLOADFILE=	@DYNLOADFILE@
  
! PYTHON=		python$(EXE)
  
  # === Definitions added by makesetup ===
***************
*** 165,169 ****
  ##########################################################################
  # Parser
! PGEN=		Parser/pgen$(EXEEXT)
  
  POBJS=		\
--- 165,169 ----
  ##########################################################################
  # Parser
! PGEN=		Parser/pgen$(EXE)
  
  POBJS=		\
***************
*** 508,512 ****
  	else true; \
  	fi
! 	(cd $(BINDIR); $(LN) python$(VERSION)$(EXEEXT) python$(EXEEXT))
  
  # Install the interpreter with $(VERSION) affixed
--- 508,512 ----
  	else true; \
  	fi
! 	(cd $(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
  
  # Install the interpreter with $(VERSION) affixed
***************
*** 521,525 ****
  		fi; \
  	done
! 	$(INSTALL_PROGRAM) $(PYTHON) $(BINDIR)/python$(VERSION)$(EXEEXT)
  	if test -f libpython$(VERSION).so; then \
  		$(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \
--- 521,525 ----
  		fi; \
  	done
! 	$(INSTALL_PROGRAM) $(PYTHON) $(BINDIR)/python$(VERSION)$(EXE)
  	if test -f libpython$(VERSION).so; then \
  		$(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \
***************
*** 550,554 ****
  LIBSUBDIRS=	lib-old lib-tk site-packages test test/output encodings \
  		distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS)
! libinstall:	python $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
--- 550,554 ----
  LIBSUBDIRS=	lib-old lib-tk site-packages test test/output encodings \
  		distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS)
! libinstall:	$(PYTHON) $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
***************
*** 616,620 ****
  	export PATH; PATH="`pwd`:$$PATH"; \
  	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
! 	export EXEEXT; EXEEXT="$(EXEEXT)"; \
  	cd $(srcdir)/Lib/$(PLATDIR); ./regen
  
--- 616,620 ----
  	export PATH; PATH="`pwd`:$$PATH"; \
  	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
! 	export EXE; EXE="$(EXE)"; \
  	cd $(srcdir)/Lib/$(PLATDIR); ./regen
  
***************
*** 693,697 ****
  # This goes into $(exec_prefix)
  sharedinstall:
! 	PYTHONPATH= ./python$(EXEEXT) $(srcdir)/setup.py install \
  		--install-platlib=$(DESTSHARED)
  
--- 693,697 ----
  # This goes into $(exec_prefix)
  sharedinstall:
! 	PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py install \
  		--install-platlib=$(DESTSHARED)