(EXEEXT): Define to @EXEEXT@ and use this variable

instead of the substitution.

3 files changed, 60 insertions, 56 deletions

diff --git a/Makefile.in b/Makefile.in
index 4ad187a8487..f9ad2d6fdbd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # DIST: that first.
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#  2000, 2001, 2002 Free Software Foundation, Inc.
+#  2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -69,6 +69,7 @@ CPPFLAGS=@CPPFLAGS@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
 YACC=@YACC@
+EXEEXT=@EXEEXT@
 
 ### These help us choose version- and architecture-specific directories
 ### to install files in.
@@ -215,8 +216,8 @@ INSTALL_STRIP =
 TRANSFORM = @program_transform_name@
 
 # What emacs should be called when installed.
-EMACS = `echo emacs@EXEEXT@ | sed '$(TRANSFORM)'`
-EMACSFULL = `echo emacs-${version}@EXEEXT@ | sed '$(TRANSFORM)'`
+EMACS = `echo emacs${EXEEXT} | sed '$(TRANSFORM)'`
+EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
 
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution.
@@ -358,7 +359,7 @@ install-arch-dep: mkdir
             exec_prefix=${exec_prefix} bindir=${bindir} \
             libexecdir=${libexecdir} archlibdir=${archlibdir} \
             INSTALL_STRIP=${INSTALL_STRIP})
-        ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs@EXEEXT@ ${bindir}/$(EMACSFULL)
+        ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} ${bindir}/$(EMACSFULL)
         -chmod 1755  ${bindir}/$(EMACSFULL)
         rm -f ${bindir}/$(EMACS)
         -ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS)
@@ -735,7 +736,7 @@ maybe_bootstrap:
 bootstrap: bootstrap-clean-before info FRC
         (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
         (cd src; $(MAKE) $(MFLAGS) bootstrap)
-        (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs@EXEEXT@)
+        (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs${EXEEXT})
         (cd src; $(MAKE) $(MFLAGS) mostlyclean)
         $(MAKE) $(MFLAGS) all
         (cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index b8d853f8eac..c88d868e374 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,5 +1,6 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
-# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003
+#  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -29,6 +30,7 @@ CFLAGS=@CFLAGS@
 ALLOCA=@ALLOCA@
 version=@version@
 configuration=@configuration@
+EXEEXT=@EXEEXT@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
@@ -100,15 +102,15 @@ INSTALL_STRIP =
 
 # Things that a user might actually run,
 # which should be installed in bindir.
-INSTALLABLES = etags@EXEEXT@ ctags@EXEEXT@ emacsclient@EXEEXT@ b2m@EXEEXT@ ebrowse@EXEEXT@
+INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
-UTILITIES=  profile@EXEEXT@ digest-doc@EXEEXT@ sorted-doc@EXEEXT@ movemail@EXEEXT@ cvtmail@EXEEXT@ fakemail@EXEEXT@ \
-            yow@EXEEXT@ hexl@EXEEXT@ update-game-score@EXEEXT@
+UTILITIES=  profile${EXEEXT} digest-doc${EXEEXT} sorted-doc${EXEEXT} movemail${EXEEXT} cvtmail${EXEEXT} fakemail${EXEEXT} \
+            yow${EXEEXT} hexl${EXEEXT} update-game-score${EXEEXT}
 
-DONT_INSTALL= test-distrib@EXEEXT@ make-docfile@EXEEXT@
+DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 
 # Like UTILITIES, but they're not system-dependent, and should not be
 #  deleted by the distclean target.
@@ -286,12 +288,12 @@ blessmail:
 maybe-blessmail: BLESSMAIL
 #ifdef MOVEMAIL_NEEDS_BLESSING
 /* Don\'t charge ahead and do it!  Let the installer decide.
-          ./blessmail ${archlibdir}/movemail@EXEEXT@  */
+          ./blessmail ${archlibdir}/movemail${EXEEXT}  */
         @if [ `wc -l <blessmail` != 2 ] ; then \
           dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
           echo Assuming $$dir is really the mail spool directory, you should; \
-          echo run  lib-src/blessmail ${archlibdir}/movemail@EXEEXT@; \
-          echo as root, to give  movemail@EXEEXT@  appropriate permissions.; \
+          echo run  lib-src/blessmail ${archlibdir}/movemail${EXEEXT}; \
+          echo as root, to give  movemail${EXEEXT}  appropriate permissions.; \
           echo Do that after running  make install.; \
         fi
 #endif
@@ -372,14 +374,14 @@ check:
         @echo "We don't have any tests for GNU Emacs yet."
 
 tags: TAGS
-TAGS: etags@EXEEXT@
+TAGS: etags${EXEEXT}
         etags *.[ch]
 
 /* This verifies that the non-ASCII characters in the file \`testfile\'
    have not been clobbered by whatever means were used to copy and
    distribute Emacs.  If they were clobbered, all the .elc files were
    clobbered too.  */
-test-distrib@EXEEXT@: ${srcdir}/test-distrib.c
+test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
         $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
         ./test-distrib ${srcdir}/testfile
 
@@ -403,34 +405,34 @@ REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
         ${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
 
-etags@EXEEXT@: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
+etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
         $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
 
-ebrowse@EXEEXT@: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
+ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
         $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
 
 /* We depend on etags to assure that parallel makes don\'t write two
    etags.o files on top of each other.  */
-ctags@EXEEXT@: etags@EXEEXT@
+ctags${EXEEXT}: etags${EXEEXT}
         $(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
 
-profile@EXEEXT@: ${srcdir}/profile.c ../src/config.h
+profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
 
-make-docfile@EXEEXT@: ${srcdir}/make-docfile.c ../src/config.h
+make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) -o make-docfile
 
-digest-doc@EXEEXT@: ${srcdir}/digest-doc.c
+digest-doc${EXEEXT}: ${srcdir}/digest-doc.c
         $(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc
 
-sorted-doc@EXEEXT@: ${srcdir}/sorted-doc.c ${ALLOCA}
+sorted-doc${EXEEXT}: ${srcdir}/sorted-doc.c ${ALLOCA}
         $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
 
-b2m@EXEEXT@: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
+b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
         $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c  -DVERSION="\"${version}\"" \
            $(GETOPTOBJS) $(LOADLIBES) -o b2m
 
-movemail@EXEEXT@: movemail.o pop.o $(GETOPTDEPS)
+movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS)
         $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail
 
 movemail.o: ${srcdir}/movemail.c ../src/config.h
@@ -439,45 +441,45 @@ movemail.o: ${srcdir}/movemail.c ../src/config.h
 pop.o: ${srcdir}/pop.c  ../src/config.h
         $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
-cvtmail@EXEEXT@: ${srcdir}/cvtmail.c
+cvtmail${EXEEXT}: ${srcdir}/cvtmail.c
         $(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
 
-fakemail@EXEEXT@: ${srcdir}/fakemail.c ../src/config.h
+fakemail${EXEEXT}: ${srcdir}/fakemail.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
 
-yow@EXEEXT@: ${srcdir}/yow.c ../src/epaths.h
+yow${EXEEXT}: ${srcdir}/yow.c ../src/epaths.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
 
-emacsclient@EXEEXT@: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS)
+emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS)
         $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c $(GETOPTOBJS)  \
            -DVERSION=`sed -n -e '/(defconst emacs-version/ s/^[^"]*\("[^"]*"\).*/\1/p' ${srcdir}/../lisp/version.el` \
            $(LOADLIBES) -o emacsclient
 
-hexl@EXEEXT@: ${srcdir}/hexl.c ../src/config.h
+hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
-update-game-score@EXEEXT@: ${srcdir}/update-game-score.c ../src/config.h
+update-game-score${EXEEXT}: ${srcdir}/update-game-score.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/update-game-score.c \
           -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
           $(LOADLIBES) -o update-game-score
 
 /* These are NOT included in INSTALLABLES or UTILITIES.
    See ../src/Makefile.in.  */
-emacstool@EXEEXT@: ${srcdir}/emacstool.c
+emacstool${EXEEXT}: ${srcdir}/emacstool.c
         $(CC) ${srcdir}/emacstool.c -o emacstool ${ALL_CFLAGS} \
           -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
 
 /* For SUN Japanese Language Environment.  */
-nemacstool@EXEEXT@: ${srcdir}/emacstool.c
+nemacstool${EXEEXT}: ${srcdir}/emacstool.c
         $(CC) -o nemacstool -DJLE ${ALL_CFLAGS} ${srcdir}/emacstool.c \
           -lsuntool -lmle -lsunwindow -lpixrect $(LOADLIBES)
 
-xvetool@EXEEXT@: ${srcdir}/emacstool.c
+xvetool${EXEEXT}: ${srcdir}/emacstool.c
         $(CC) -o xvetool -DXVIEW ${ALL_CFLAGS} ${srcdir}/emacstool.c \
           -lxview -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
           $(LOADLIBES)
 
-xveterm@EXEEXT@: ${srcdir}/emacstool.c
+xveterm${EXEEXT}: ${srcdir}/emacstool.c
         $(CC) -o xveterm -DXVIEW -DTTERM ${ALL_CFLAGS} ${srcdir}/emacstool.c \
           -lxview -lolgx -lX  -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
           $(LOADLIBES)
diff --git a/src/Makefile.in b/src/Makefile.in
index 9f8e13c5a0f..2546c46a170 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for GNU Emacs.
-# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 2001
+# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 2001, 2003
 # Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -37,6 +37,7 @@ CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 LN_S=@LN_S@
+EXEEXT=@EXEEXT@
 # Substitute an assignment for the MAKE variable, because
 # BSD doesn't have it as a default.
 @SET_MAKE@
@@ -887,12 +888,12 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \
 #define OBJECTS_MACHINE
 #endif
 
-all: emacs@EXEEXT@ OTHER_FILES
+all: emacs${EXEEXT} OTHER_FILES
 
-emacs@EXEEXT@: temacs@EXEEXT@ ${etc}DOC ${lisp}
+emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
 #ifdef CANNOT_DUMP
-        rm -f emacs@EXEEXT@
-        ln temacs@EXEEXT@ emacs@EXEEXT@
+        rm -f emacs${EXEEXT}
+        ln temacs${EXEEXT} emacs${EXEEXT}
 #else
 #ifdef HAVE_SHM
         LC_ALL=C ./temacs -nl -batch -l loadup dump
@@ -915,15 +916,15 @@ ${etc}DOC: ${libsrc}make-docfile ${obj} ${shortlisp} ${SOME_MACHINE_LISP}
         ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
         ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
 
-${libsrc}make-docfile@EXEEXT@:
-        cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile@EXEEXT@
+${libsrc}make-docfile${EXEEXT}:
+        cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT}
 
 /* Some systems define this to cause parallel Make-ing.  */
 #ifndef MAKE_PARALLEL
 #define MAKE_PARALLEL
 #endif
 
-temacs@EXEEXT@: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args@EXEEXT@
+temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
         $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
     OBJECTS_MACHINE ${LIBES}
@@ -931,7 +932,7 @@ temacs@EXEEXT@: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${
 /* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
    often contain options that have to do with using Emacs's crt0,
    which are only good with temacs.  */
-prefix-args@EXEEXT@: prefix-args.c $(config_h)
+prefix-args${EXEEXT}: prefix-args.c $(config_h)
         $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args
 
 /* Don't lose if this was not defined.  */
@@ -1253,25 +1254,25 @@ macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \
         ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings
 macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \
   ${emacsapp}Contents/Resources/Emacs.rsrc
-${emacsapp}Contents/MacOS/Emacs: emacs@EXEEXT@
+${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT}
         mkdir -p ${emacsapp}Contents/MacOS/;
-        cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs@EXEEXT@ Emacs@EXEEXT@
+        cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT}
 ${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r
         /Developer/Tools/Rez -useDF \
         -o ${emacsapp}Contents/Resources/Emacs.rsrc \
         /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $<
 #endif
 
-${libsrc}emacstool@EXEEXT@: ${libsrc}emacstool.c
-        cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool@EXEEXT@
+${libsrc}emacstool${EXEEXT}: ${libsrc}emacstool.c
+        cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool${EXEEXT}
 bootstrapclean:
-        rm -f bootstrap-emacs@EXEEXT@
+        rm -f bootstrap-emacs${EXEEXT}
 mostlyclean:
-        rm -f temacs@EXEEXT@ prefix-args@EXEEXT@ core *.core \#* *.o libXMenu11.a liblw.a
+        rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a
         rm -f ../etc/DOC
-        rm -f bootstrap-emacs@EXEEXT@
+        rm -f bootstrap-emacs${EXEEXT}
 clean: mostlyclean
-        rm -f emacs-*@EXEEXT@ emacs@EXEEXT@
+        rm -f emacs-*${EXEEXT} emacs${EXEEXT}
 /**/# This is used in making a distribution.
 /**/# Do not use it on development directories!
 distclean: clean
@@ -1284,7 +1285,7 @@ maintainer-clean: distclean
         @echo "it deletes files that may require special tools to rebuild."
         rm -f TAGS
 versionclean:
-        -rm -f emacs@EXEEXT@ emacs-* ../etc/DOC*
+        -rm -f emacs${EXEEXT} emacs-* ../etc/DOC*
 extraclean: distclean
         -rm -f *~ \#* m/?*~ s/?*~
 
@@ -1322,20 +1323,20 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS
 
 /* Bootstrapping.  */
 
-bootstrap: bootstrap-emacs@EXEEXT@
+bootstrap: bootstrap-emacs${EXEEXT}
 
 /* Dump an Emacs executable named bootstrap-emacs containing the
    files from loadup.el in source form.  */
 
-bootstrap-emacs@EXEEXT@: temacs@EXEEXT@
+bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
 #ifdef CANNOT_DUMP
-        ln temacs@EXEEXT@ bootstrap-emacs@EXEEXT@
+        ln temacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #else
 #ifdef HAVE_SHM
         ./temacs -nl -batch -l loadup bootstrap
 #else /* ! defined (HAVE_SHM) */
         ./temacs --batch --load loadup bootstrap
 #endif /* ! defined (HAVE_SHM) */
-        mv -f emacs@EXEEXT@ bootstrap-emacs@EXEEXT@
+        mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #endif /* ! defined (CANNOT_DUMP) */