diff options
| author | Glenn Morris | 2011-01-07 18:53:50 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-07 18:53:50 -0800 |
| commit | e7a4241753be8d11d72945af0c34b45f6645b60e (patch) | |
| tree | c84c2cce8163a6187a5842d0c09e0d7c5e802928 | |
| parent | 16eea16bc64a601f1d0bcda8c961873355279d38 (diff) | |
| download | emacs-e7a4241753be8d11d72945af0c34b45f6645b60e.tar.gz emacs-e7a4241753be8d11d72945af0c34b45f6645b60e.zip | |
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.
| -rw-r--r-- | leim/ChangeLog | 3 | ||||
| -rw-r--r-- | leim/Makefile.in | 2 | ||||
| -rw-r--r-- | leim/makefile.w32-in | 2 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 2 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | 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,6 +1,9 @@ | |||
| 1 | 2011-01-08 Glenn Morris <rgm@gnu.org> | 1 | 2011-01-08 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * makefile.w32-in (RUN_EMACS): | 3 | * makefile.w32-in (RUN_EMACS): |
| 4 | * Makefile.in (RUN-EMACS): Add --no-site-lisp. | ||
| 5 | |||
| 6 | * makefile.w32-in (RUN_EMACS): | ||
| 4 | * Makefile.in (RUN-EMACS): -batch implies --no-init-file. | 7 | * Makefile.in (RUN-EMACS): -batch implies --no-init-file. |
| 5 | 8 | ||
| 6 | 2010-08-28 Kenichi Handa <handa@m17n.org> | 9 | 2010-08-28 Kenichi Handa <handa@m17n.org> |
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 | |||
| 48 | 48 | ||
| 49 | # How to run Emacs. | 49 | # How to run Emacs. |
| 50 | RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ | 50 | RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ |
| 51 | ${BUILT-EMACS} -batch --no-site-file | 51 | ${BUILT-EMACS} -batch --no-site-file --no-site-lisp |
| 52 | 52 | ||
| 53 | # Subdirectories to be made if ${srcdir} is different from the current | 53 | # Subdirectories to be made if ${srcdir} is different from the current |
| 54 | # directory. | 54 | # 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 | |||
| 37 | buildlisppath=$(CURDIR)/$(dot)$(dot)/lisp | 37 | buildlisppath=$(CURDIR)/$(dot)$(dot)/lisp |
| 38 | 38 | ||
| 39 | # How to run Emacs. | 39 | # How to run Emacs. |
| 40 | RUN_EMACS = "$(BUILT_EMACS)" -batch --no-site-file | 40 | RUN_EMACS = "$(BUILT_EMACS)" -batch --no-site-file --no-site-lisp |
| 41 | 41 | ||
| 42 | # Set EMACSLOADPATH correctly (already defined in environment). | 42 | # Set EMACSLOADPATH correctly (already defined in environment). |
| 43 | EMACSLOADPATH=$(buildlisppath) | 43 | 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 @@ | |||
| 1 | 2011-01-08 Glenn Morris <rgm@gnu.org> | 1 | 2011-01-08 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (EMACSOPT): Add --no-site-lisp. | ||
| 4 | |||
| 3 | * Makefile.in (EMACSOPT): Remove --multibyte, it does nothing any more. | 5 | * Makefile.in (EMACSOPT): Remove --multibyte, it does nothing any more. |
| 4 | 6 | ||
| 5 | 2011-01-02 Glenn Morris <rgm@gnu.org> | 7 | 2011-01-02 Glenn Morris <rgm@gnu.org> |
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 | |||
| 25 | 25 | ||
| 26 | # Following ../lisp/Makefile.in. | 26 | # Following ../lisp/Makefile.in. |
| 27 | EMACS = ../src/emacs | 27 | EMACS = ../src/emacs |
| 28 | EMACSOPT = -batch --no-site-file | 28 | EMACSOPT = -batch --no-site-file --no-site-lisp |
| 29 | 29 | ||
| 30 | # ==================== Things `configure' will edit ==================== | 30 | # ==================== Things `configure' will edit ==================== |
| 31 | 31 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a3d6240126..d57a8a3532a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-01-08 Glenn Morris <rgm@gnu.org> | 1 | 2011-01-08 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * makefile.w32-in (EMACSOPT): Add --no-site-lisp. | ||
| 4 | |||
| 3 | * makefile.w32-in (EMACSOPT): -batch implies --no-init-file. | 5 | * makefile.w32-in (EMACSOPT): -batch implies --no-init-file. |
| 4 | 6 | ||
| 5 | 2011-01-07 Sam Steingold <sds@gnu.org> | 7 | 2011-01-07 Sam Steingold <sds@gnu.org> |
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 | |||
| 34 | 34 | ||
| 35 | # Command line flags for Emacs. | 35 | # Command line flags for Emacs. |
| 36 | 36 | ||
| 37 | EMACSOPT = -batch --no-site-file | 37 | EMACSOPT = -batch --no-site-file --no-site-lisp |
| 38 | 38 | ||
| 39 | # Extra flags to pass to the byte compiler | 39 | # Extra flags to pass to the byte compiler |
| 40 | BYTE_COMPILE_EXTRA_FLAGS = | 40 | BYTE_COMPILE_EXTRA_FLAGS = |