(compile-files): Fixed the "tr" strings.

(EMACS): Set to ../src/emacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7e6d1c9bc42f2ca8c35964c58b3836f828da3d3..cb2b9ed4921ecefb3b3e5a938b5433366b5d319b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-25  Sam Steingold  <sds@ksp.com>
+
+       * Makefile (compile-files): Fixed the "tr" strings.
+       (EMACS): Set to ../src/emacs.
+
 1999-10-25  Gerd Moellmann  <gerd@gnu.org>
 
        * info.el (Info-build-node-completions): Add '("*") to the

diff --git a/lisp/Makefile b/lisp/Makefile
index 9db056ca9318d15b4b380cadef1d190f08fbf371..485b4598ba2b5984ed3c3d561e11bbc376fec80a 100644 (file)
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -5,7 +5,7 @@
 # You can specify a different executable on the make command line,
 # e.g. "make EMACS=../src/emacs ...".
 
-EMACS = emacs
+EMACS = ../src/emacs
 
 # Command line flags for Emacs.  This must include --multibyte,
 # otherwise some files will not compile.
@@ -112,9 +112,9 @@ $(DONTCOMPILE:.el=.elc):
 compile-files: subdirs.el doit
        find . -name "*.elc" -print | xargs chmod +w;           \
        wd=.; $(setwins);                                       \
-       elpat=`echo $$wins | tr '[      ]' '[\012\012]' |       \
+       elpat=`echo $$wins | tr '       ' '\012\012' |  \
                sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
-       els=`echo $$elpat $(DONTCOMPILE) | tr '[         ]' '[\012\012]' | sort | uniq -u`; \
+       els=`echo $$elpat $(DONTCOMPILE) | tr '  ' '\012\012' | sort | uniq -u`; \
        echo $$els; \
        EMACSLOADPATH=`pwd` $(emacs) -f batch-byte-compile $$els