comparison src/Makefile.in @ 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 59091995520c
children 029c524b4a44 b85b19b8eb65 0b158db81c28
comparison
equal deleted inserted replaced
57206:6e40bed9e91e 57207:d07786352759
903 903
904 #ifndef OBJECTS_MACHINE 904 #ifndef OBJECTS_MACHINE
905 #define OBJECTS_MACHINE 905 #define OBJECTS_MACHINE
906 #endif 906 #endif
907 907
908 #ifdef HAVE_EXECSHIELD
909 #undef i386
910 RUN_TEMACS = @SETARCH@ i386 ./temacs
911 #else
912 RUN_TEMACS = ./temacs
913 #endif
914
908 all: emacs${EXEEXT} OTHER_FILES 915 all: emacs${EXEEXT} OTHER_FILES
909 916
910 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} 917 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
911 #ifdef CANNOT_DUMP 918 #ifdef CANNOT_DUMP
912 rm -f emacs${EXEEXT} 919 rm -f emacs${EXEEXT}
913 ln temacs${EXEEXT} emacs${EXEEXT} 920 ln temacs${EXEEXT} emacs${EXEEXT}
914 #else 921 #else
915 #ifdef HAVE_SHM 922 #ifdef HAVE_SHM
916 LC_ALL=C ./temacs -nl -batch -l loadup dump 923 LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump
917 #else /* ! defined (HAVE_SHM) */ 924 #else /* ! defined (HAVE_SHM) */
918 LC_ALL=C ./temacs -batch -l loadup dump 925 LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
919 #endif /* ! defined (HAVE_SHM) */ 926 #endif /* ! defined (HAVE_SHM) */
920 #endif /* ! defined (CANNOT_DUMP) */ 927 #endif /* ! defined (CANNOT_DUMP) */
921 -./emacs -q -batch -f list-load-path-shadows 928 -./emacs -q -batch -f list-load-path-shadows
922 929
923 /* We run make-docfile twice because the command line may get too long 930 /* We run make-docfile twice because the command line may get too long
1330 bootstrap-emacs${EXEEXT}: temacs${EXEEXT} 1337 bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
1331 #ifdef CANNOT_DUMP 1338 #ifdef CANNOT_DUMP
1332 ln temacs${EXEEXT} bootstrap-emacs${EXEEXT} 1339 ln temacs${EXEEXT} bootstrap-emacs${EXEEXT}
1333 #else 1340 #else
1334 #ifdef HAVE_SHM 1341 #ifdef HAVE_SHM
1335 ./temacs -nl -batch -l loadup bootstrap 1342 $(RUN_TEMACS) -nl -batch -l loadup bootstrap
1336 #else /* ! defined (HAVE_SHM) */ 1343 #else /* ! defined (HAVE_SHM) */
1337 ./temacs --batch --load loadup bootstrap 1344 $(RUN_TEMACS) --batch --load loadup bootstrap
1338 #endif /* ! defined (HAVE_SHM) */ 1345 #endif /* ! defined (HAVE_SHM) */
1339 mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} 1346 mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
1340 #endif /* ! defined (CANNOT_DUMP) */ 1347 #endif /* ! defined (CANNOT_DUMP) */