From e7a4241753be8d11d72945af0c34b45f6645b60e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 7 Jan 2011 18:53:50 -0800 Subject: [PATCH] Add --no-site-lisp to more Makefiles. * leim/makefile.w32-in (RUN_EMACS): * leim/Makefile.in (RUN-EMACS): Add --no-site-lisp. * lib-src/Makefile.in (EMACSOPT): Add --no-site-lisp. * lisp/makefile.w32-in (EMACSOPT): Add --no-site-lisp. --- leim/ChangeLog | 3 +++ leim/Makefile.in | 2 +- leim/makefile.w32-in | 2 +- lib-src/ChangeLog | 2 ++ lib-src/Makefile.in | 2 +- lisp/ChangeLog | 2 ++ lisp/makefile.w32-in | 2 +- 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/leim/ChangeLog b/leim/ChangeLog index 489fc39e738..7f58ca1b717 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,5 +1,8 @@ 2011-01-08 Glenn Morris + * makefile.w32-in (RUN_EMACS): + * Makefile.in (RUN-EMACS): Add --no-site-lisp. + * makefile.w32-in (RUN_EMACS): * Makefile.in (RUN-EMACS): -batch implies --no-init-file. diff --git a/leim/Makefile.in b/leim/Makefile.in index 955aeb98421..99ac2dc055d 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -48,7 +48,7 @@ buildlisppath=${srcdir}/../lisp # How to run Emacs. RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ - ${BUILT-EMACS} -batch --no-site-file + ${BUILT-EMACS} -batch --no-site-file --no-site-lisp # Subdirectories to be made if ${srcdir} is different from the current # directory. diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in index 3ab9a754930..702e8505d1e 100644 --- a/leim/makefile.w32-in +++ b/leim/makefile.w32-in @@ -37,7 +37,7 @@ BUILT_EMACS = $(THISDIR)/$(dot)$(dot)/src/$(BLD)/emacs.exe buildlisppath=$(CURDIR)/$(dot)$(dot)/lisp # How to run Emacs. -RUN_EMACS = "$(BUILT_EMACS)" -batch --no-site-file +RUN_EMACS = "$(BUILT_EMACS)" -batch --no-site-file --no-site-lisp # Set EMACSLOADPATH correctly (already defined in environment). EMACSLOADPATH=$(buildlisppath) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f4360272117..1f753b0dc4c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,7 @@ 2011-01-08 Glenn Morris + * Makefile.in (EMACSOPT): Add --no-site-lisp. + * Makefile.in (EMACSOPT): Remove --multibyte, it does nothing any more. 2011-01-02 Glenn Morris diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 81ef74939f3..ef27adc839f 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -25,7 +25,7 @@ SHELL = /bin/sh # Following ../lisp/Makefile.in. EMACS = ../src/emacs -EMACSOPT = -batch --no-site-file +EMACSOPT = -batch --no-site-file --no-site-lisp # ==================== Things `configure' will edit ==================== diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a3d6240126..d57a8a3532a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-01-08 Glenn Morris + * makefile.w32-in (EMACSOPT): Add --no-site-lisp. + * makefile.w32-in (EMACSOPT): -batch implies --no-init-file. 2011-01-07 Sam Steingold diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 0b43f8dd14e..39af7a8c472 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -34,7 +34,7 @@ EMACS = $(THISDIR)/../bin/emacs.exe # Command line flags for Emacs. -EMACSOPT = -batch --no-site-file +EMACSOPT = -batch --no-site-file --no-site-lisp # Extra flags to pass to the byte compiler BYTE_COMPILE_EXTRA_FLAGS = -- 2.39.5