Mercurial > emacs
changeset 57207:d07786352759
* config.in: Rebuild.
* Makefile.in: Run setarh i386 ./temacs if exec-shield is present.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 24 Sep 2004 07:19:05 +0000 |
| parents | 6e40bed9e91e |
| children | 5c9eff7b7dc3 |
| files | src/ChangeLog src/Makefile.in src/config.in |
| diffstat | 3 files changed, 20 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Sep 24 07:18:15 2004 +0000 +++ b/src/ChangeLog Fri Sep 24 07:19:05 2004 +0000 @@ -1,3 +1,9 @@ +2004-09-24 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * config.in: Rebuild. + + * Makefile.in: Run setarh i386 ./temacs if exec-shield is present. + 2004-09-18 Stefan Monnier <monnier@iro.umontreal.ca> * xterm.c (x_term_init): Work around a bug in some X servers.
--- a/src/Makefile.in Fri Sep 24 07:18:15 2004 +0000 +++ b/src/Makefile.in Fri Sep 24 07:19:05 2004 +0000 @@ -905,6 +905,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} @@ -913,9 +920,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 @@ -1332,9 +1339,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) */
--- a/src/config.in Fri Sep 24 07:18:15 2004 +0000 +++ b/src/config.in Fri Sep 24 07:19:05 2004 +0000 @@ -136,6 +136,9 @@ /* Define to 1 if you have the `euidaccess' function. */ #undef HAVE_EUIDACCESS +/* Define to 1 if this OS has exec shield. */ +#undef HAVE_EXECSHIELD + /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H