[Emacs-diffs] Changes to emacs/src/Makefile.in [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.279.2.7 emacs/src/Makefile.in:1.279.2.8
*** emacs/src/Makefile.in:1.279.2.7     Wed Sep 15 09:00:00 2004
--- emacs/src/Makefile.in       Sat Sep 25 12:05:30 2004
***************
*** 887,892 ****
--- 887,899 ----
  #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,903 ****
        ln temacs${EXEEXT} emacs${EXEEXT}
  #else
  #ifdef HAVE_SHM
!       LC_ALL=C ./temacs -nl -batch -l loadup dump
  #else /* ! defined (HAVE_SHM) */
!       LC_ALL=C ./temacs -batch -l loadup dump
  #endif /* ! defined (HAVE_SHM) */
  #endif /* ! defined (CANNOT_DUMP) */
        -./emacs -q -batch -f list-load-path-shadows
--- 902,910 ----
        ln temacs${EXEEXT} emacs${EXEEXT}
  #else
  #ifdef HAVE_SHM
!       LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump
  #else /* ! defined (HAVE_SHM) */
!       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,1334 ****
        ln temacs${EXEEXT} bootstrap-emacs${EXEEXT}
  #else
  #ifdef HAVE_SHM
!       ./temacs -nl -batch -l loadup bootstrap
  #else /* ! defined (HAVE_SHM) */
!       ./temacs --batch --load loadup bootstrap
  #endif /* ! defined (HAVE_SHM) */
        mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
  #endif /* ! defined (CANNOT_DUMP) */
--- 1333,1341 ----
        ln temacs${EXEEXT} bootstrap-emacs${EXEEXT}
  #else
  #ifdef HAVE_SHM
!       $(RUN_TEMACS) -nl -batch -l loadup bootstrap
  #else /* ! defined (HAVE_SHM) */
!       $(RUN_TEMACS) --batch --load loadup bootstrap
  #endif /* ! defined (HAVE_SHM) */
        mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
  #endif /* ! defined (CANNOT_DUMP) */