Address Bug #115057: add a --with-suffix option to set the EXE
variable in the Makefiles from the configure script. Usefil for Cygwin and Mac OS X builds.
This commit is contained in:
parent
ef5f2b9dbb
commit
ff555e383d
|
@ -89,8 +89,8 @@ DESTSHARED= $(BINLIBDEST)/lib-dynload
|
|||
# Shell used by make (some versions default to the login shell, which is bad)
|
||||
SHELL= /bin/sh
|
||||
|
||||
# Use ``EXE=.exe'' for Unix emulations on DOS/Windows (e.g. GNUWIN32)
|
||||
EXE=
|
||||
# Executable suffix (.exe on Windows and Mac OS X)
|
||||
EXE= @EXE@
|
||||
|
||||
# Modes for directories, executables and data files created by the
|
||||
# install process. Default to user-only-writable for all file types.
|
||||
|
|
|
@ -41,6 +41,9 @@ prefix= @prefix@
|
|||
# Install prefix for architecture-dependent files
|
||||
exec_prefix= @exec_prefix@
|
||||
|
||||
# Executable suffix (.exe on Windows and Mac OS X)
|
||||
EXE= @EXE@
|
||||
|
||||
# Expanded directories
|
||||
BINDIR= $(exec_prefix)/bin
|
||||
LIBDIR= $(exec_prefix)/lib
|
||||
|
@ -118,13 +121,10 @@ add2lib: $(OBJS)
|
|||
$(AR) cr $(LIBRARY) $(OBJS)
|
||||
touch add2lib
|
||||
|
||||
# Use ``EXE=.exe'' for Unix emulations on DOS/Windows
|
||||
EXE=
|
||||
|
||||
# This target is used by the master Makefile to link the final binary.
|
||||
link: $(MAINOBJ)
|
||||
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) $(MAINOBJ) \
|
||||
$(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python $(LDLAST)
|
||||
$(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python$(EXE) $(LDLAST)
|
||||
mv python$(EXE) ../python$(EXE)
|
||||
|
||||
clean:
|
||||
|
|
|
@ -193,6 +193,15 @@ then
|
|||
fi
|
||||
|
||||
AC_PROG_CC
|
||||
AC_SUBST(EXE)
|
||||
AC_MSG_CHECKING(for --with-suffix)
|
||||
AC_ARG_WITH(suffix, [ --with-suffix=.exe set executable suffix],[
|
||||
case $withval in
|
||||
no) EXE=;;
|
||||
yes) EXE=.exe;;
|
||||
*) EXE=$withval;;
|
||||
esac])
|
||||
AC_MSG_RESULT($EXE)
|
||||
|
||||
case $MACHDEP in
|
||||
bsdos*)
|
||||
|
|
Loading…
Reference in New Issue