Mercurial > emacs
comparison src/Makefile.in @ 89985:0b158db81c28
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 |
comparison
equal
deleted
inserted
replaced
89984:8592df97bf76 | 89985:0b158db81c28 |
---|---|
885 | 885 |
886 #ifndef OBJECTS_MACHINE | 886 #ifndef OBJECTS_MACHINE |
887 #define OBJECTS_MACHINE | 887 #define OBJECTS_MACHINE |
888 #endif | 888 #endif |
889 | 889 |
890 #ifdef HAVE_EXECSHIELD | |
891 #undef i386 | |
892 RUN_TEMACS = @SETARCH@ i386 ./temacs | |
893 #else | |
894 RUN_TEMACS = ./temacs | |
895 #endif | |
896 | |
890 all: emacs${EXEEXT} OTHER_FILES | 897 all: emacs${EXEEXT} OTHER_FILES |
891 | 898 |
892 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} | 899 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} |
893 #ifdef CANNOT_DUMP | 900 #ifdef CANNOT_DUMP |
894 rm -f emacs${EXEEXT} | 901 rm -f emacs${EXEEXT} |
895 ln temacs${EXEEXT} emacs${EXEEXT} | 902 ln temacs${EXEEXT} emacs${EXEEXT} |
896 #else | 903 #else |
897 #ifdef HAVE_SHM | 904 #ifdef HAVE_SHM |
898 LC_ALL=C ./temacs -nl -batch -l loadup dump | 905 LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump |
899 #else /* ! defined (HAVE_SHM) */ | 906 #else /* ! defined (HAVE_SHM) */ |
900 LC_ALL=C ./temacs -batch -l loadup dump | 907 LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump |
901 #endif /* ! defined (HAVE_SHM) */ | 908 #endif /* ! defined (HAVE_SHM) */ |
902 #endif /* ! defined (CANNOT_DUMP) */ | 909 #endif /* ! defined (CANNOT_DUMP) */ |
903 -./emacs -q -batch -f list-load-path-shadows | 910 -./emacs -q -batch -f list-load-path-shadows |
904 | 911 |
905 /* We run make-docfile twice because the command line may get too long | 912 /* We run make-docfile twice because the command line may get too long |
1324 bootstrap-emacs${EXEEXT}: temacs${EXEEXT} | 1331 bootstrap-emacs${EXEEXT}: temacs${EXEEXT} |
1325 #ifdef CANNOT_DUMP | 1332 #ifdef CANNOT_DUMP |
1326 ln temacs${EXEEXT} bootstrap-emacs${EXEEXT} | 1333 ln temacs${EXEEXT} bootstrap-emacs${EXEEXT} |
1327 #else | 1334 #else |
1328 #ifdef HAVE_SHM | 1335 #ifdef HAVE_SHM |
1329 ./temacs -nl -batch -l loadup bootstrap | 1336 $(RUN_TEMACS) -nl -batch -l loadup bootstrap |
1330 #else /* ! defined (HAVE_SHM) */ | 1337 #else /* ! defined (HAVE_SHM) */ |
1331 ./temacs --batch --load loadup bootstrap | 1338 $(RUN_TEMACS) --batch --load loadup bootstrap |
1332 #endif /* ! defined (HAVE_SHM) */ | 1339 #endif /* ! defined (HAVE_SHM) */ |
1333 mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} | 1340 mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} |
1334 #endif /* ! defined (CANNOT_DUMP) */ | 1341 #endif /* ! defined (CANNOT_DUMP) */ |