aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann1999-10-25 16:29:44 +0000
committerGerd Moellmann1999-10-25 16:29:44 +0000
commite3384ae764a5628a0407c5d3ab70330209df5843 (patch)
treeddb1ec204b64eedef28807ad976c177138eb4de9
parent711331aa7581c03106fd302c7b8fe80609593c7d (diff)
downloademacs-e3384ae764a5628a0407c5d3ab70330209df5843.tar.gz
emacs-e3384ae764a5628a0407c5d3ab70330209df5843.zip
(compile-files): Fixed the "tr" strings.
(EMACS): Set to ../src/emacs.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7e6d1c9bc4..cb2b9ed4921 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
11999-10-25 Sam Steingold <sds@ksp.com>
2
3 * Makefile (compile-files): Fixed the "tr" strings.
4 (EMACS): Set to ../src/emacs.
5
11999-10-25 Gerd Moellmann <gerd@gnu.org> 61999-10-25 Gerd Moellmann <gerd@gnu.org>
2 7
3 * info.el (Info-build-node-completions): Add '("*") to the 8 * info.el (Info-build-node-completions): Add '("*") to the
diff --git a/lisp/Makefile b/lisp/Makefile
index 9db056ca931..485b4598ba2 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -5,7 +5,7 @@
5# You can specify a different executable on the make command line, 5# You can specify a different executable on the make command line,
6# e.g. "make EMACS=../src/emacs ...". 6# e.g. "make EMACS=../src/emacs ...".
7 7
8EMACS = emacs 8EMACS = ../src/emacs
9 9
10# Command line flags for Emacs. This must include --multibyte, 10# Command line flags for Emacs. This must include --multibyte,
11# otherwise some files will not compile. 11# otherwise some files will not compile.
@@ -112,9 +112,9 @@ $(DONTCOMPILE:.el=.elc):
112compile-files: subdirs.el doit 112compile-files: subdirs.el doit
113 find . -name "*.elc" -print | xargs chmod +w; \ 113 find . -name "*.elc" -print | xargs chmod +w; \
114 wd=.; $(setwins); \ 114 wd=.; $(setwins); \
115 elpat=`echo $$wins | tr '[ ]' '[\012\012]' | \ 115 elpat=`echo $$wins | tr ' ' '\012\012' | \
116 sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ 116 sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
117 els=`echo $$elpat $(DONTCOMPILE) | tr '[ ]' '[\012\012]' | sort | uniq -u`; \ 117 els=`echo $$elpat $(DONTCOMPILE) | tr ' ' '\012\012' | sort | uniq -u`; \
118 echo $$els; \ 118 echo $$els; \
119 EMACSLOADPATH=`pwd` $(emacs) -f batch-byte-compile $$els 119 EMACSLOADPATH=`pwd` $(emacs) -f batch-byte-compile $$els
120 120