[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/Makefile.in
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/Makefile.in |
Date: |
Fri, 24 Sep 2004 03:42:06 -0400 |
Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.300 emacs/src/Makefile.in:1.301
*** emacs/src/Makefile.in:1.300 Fri Sep 10 18:16:57 2004
--- emacs/src/Makefile.in Fri Sep 24 07:19:05 2004
***************
*** 905,910 ****
--- 905,917 ----
#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,921 ****
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
--- 920,928 ----
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
***************
*** 1332,1340 ****
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) */
--- 1339,1347 ----
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) */