* config.in: Rebuild.

* Makefile.in: Run setarh i386 ./temacs if exec-shield  is present.

1 files changed, 11 insertions, 4 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 5769e8a1e07..9fc7f7e4a9f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -905,6 +905,13 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \
 #define OBJECTS_MACHINE
 #endif
 
+#ifdef HAVE_EXECSHIELD
+#undef i386
+RUN_TEMACS = @SETARCH@ i386 ./temacs
+#else
+RUN_TEMACS = ./temacs
+#endif
+
 all: emacs${EXEEXT} OTHER_FILES
 
 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
@@ -913,9 +920,9 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
         ln temacs${EXEEXT} emacs${EXEEXT}
 #else
 #ifdef HAVE_SHM
-        LC_ALL=C ./temacs -nl -batch -l loadup dump
+        LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump
 #else /* ! defined (HAVE_SHM) */
-        LC_ALL=C ./temacs -batch -l loadup dump
+        LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
 #endif /* ! defined (HAVE_SHM) */
 #endif /* ! defined (CANNOT_DUMP) */
         -./emacs -q -batch -f list-load-path-shadows
@@ -1332,9 +1339,9 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
         ln temacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #else
 #ifdef HAVE_SHM
-        ./temacs -nl -batch -l loadup bootstrap
+        $(RUN_TEMACS) -nl -batch -l loadup bootstrap
 #else /* ! defined (HAVE_SHM) */
-        ./temacs --batch --load loadup bootstrap
+        $(RUN_TEMACS) --batch --load loadup bootstrap
 #endif /* ! defined (HAVE_SHM) */
         mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #endif /* ! defined (CANNOT_DUMP) */