Mercurial > emacs

diff src/Makefile.in @ 89985:0b158db81c28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-44 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-562 Update from CVS: lisp/subr.el (after-change-major-mode-hook): Doc fix. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-563 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-570 Update from CVS
author Miles Bader <miles@gnu.org>
date Sat, 25 Sep 2004 12:05:36 +0000
parents 566253900690 d07786352759
children ff0e824afa37
line wrap: on
line diff
--- a/src/Makefile.in	Tue Sep 21 20:44:26 2004 +0000
+++ b/src/Makefile.in	Sat Sep 25 12:05:36 2004 +0000
@@ -887,6 +887,13 @@
 #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}
@@ -895,9 +902,9 @@
 	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
@@ -1326,9 +1333,9 @@
 	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) */