comparison src/Makefile.in @ 83213:d83f49cefda3

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-593 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-594 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-595 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-596 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-597 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-598 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-599 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-600 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-601 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-602 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-603 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-42 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-43 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-44 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-253
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 07 Oct 2004 16:52:19 +0000
parents b85b19b8eb65 029c524b4a44
children ae7fab96922c
comparison
equal deleted inserted replaced
83212:f70dc61a797f 83213:d83f49cefda3
907 907
908 #ifndef OBJECTS_MACHINE 908 #ifndef OBJECTS_MACHINE
909 #define OBJECTS_MACHINE 909 #define OBJECTS_MACHINE
910 #endif 910 #endif
911 911
912 #ifdef HAVE_EXECSHIELD 912 #ifdef HAVE_RANDOM_HEAPSTART
913 #undef i386 913 #undef i386
914 RUN_TEMACS = @SETARCH@ i386 ./temacs 914 RUN_TEMACS = @SETARCH@ i386 ./temacs
915 #else 915 #else
916 RUN_TEMACS = ./temacs 916 RUN_TEMACS = ./temacs
917 #endif 917 #endif