comparison lisp/Makefile.in @ 33158:075e5f998739

* Makefile.in (emacs): Set EMACSLOADPATH always. (update-authors, .el.elc, compile-files): Don't do it explicitly here.
author Ken Raeburn <raeburn@raeburn.org>
date Thu, 02 Nov 2000 18:49:04 +0000
parents f677903fb663
children 2b0399706883
comparison
equal deleted inserted replaced
33157:b3b6a57b5f5b 33158:075e5f998739
67 $(lisp)/emacs-lisp/bytecomp.el \ 67 $(lisp)/emacs-lisp/bytecomp.el \
68 $(lisp)/subr.el 68 $(lisp)/subr.el
69 69
70 # The actual Emacs command run in the targets below. 70 # The actual Emacs command run in the targets below.
71 71
72 emacs = $(EMACS) $(EMACSOPT) 72 emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT)
73 73
74 # Common command to find subdirectories 74 # Common command to find subdirectories
75 75
76 setwins=subdirs=`find $$wd -type d -print`; \ 76 setwins=subdirs=`find $$wd -type d -print`; \
77 for file in $$subdirs; do \ 77 for file in $$subdirs; do \
122 updates: update-subdirs autoloads finder-data custom-deps 122 updates: update-subdirs autoloads finder-data custom-deps
123 123
124 # Update the AUTHORS file. 124 # Update the AUTHORS file.
125 125
126 update-authors: 126 update-authors:
127 EMACSLOADPATH=$(lisp) $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir) 127 $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir)
128 128
129 TAGS: $(lisptagsfiles1) $(lisptagsfiles2) 129 TAGS: $(lisptagsfiles1) $(lisptagsfiles2)
130 ${ETAGS} $(lisptagsfiles1) $(lisptagsfiles2) 130 ${ETAGS} $(lisptagsfiles1) $(lisptagsfiles2)
131 131
132 TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) 132 TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
133 ${ETAGS} -o TAGS-LISP $(lisptagsfiles1) $(lisptagsfiles2) 133 ${ETAGS} -o TAGS-LISP $(lisptagsfiles1) $(lisptagsfiles2)
134 134
135 .el.elc: subdirs.el 135 .el.elc: subdirs.el
136 -EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $< 136 -$(emacs) -f batch-byte-compile $<
137 137
138 $(DONTCOMPILE:.el=.elc): 138 $(DONTCOMPILE:.el=.elc):
139 -rm -f $@ 139 -rm -f $@
140 140
141 # Compile all Lisp files, except those from DONTCOMPILE. This 141 # Compile all Lisp files, except those from DONTCOMPILE. This
154 sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ 154 sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
155 els=`echo $$elpat $(DONTCOMPILE) $(COMPILE_FIRST) | \ 155 els=`echo $$elpat $(DONTCOMPILE) $(COMPILE_FIRST) | \
156 tr ' ' '\012\012' | sort | uniq -u`; \ 156 tr ' ' '\012\012' | sort | uniq -u`; \
157 for el in $(COMPILE_FIRST) $$els; do \ 157 for el in $(COMPILE_FIRST) $$els; do \
158 echo Compiling $$el; \ 158 echo Compiling $$el; \
159 EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $$el; \ 159 $(emacs) -f batch-byte-compile $$el || exit 1; \
160 done 160 done
161 161
162 # Backup compiled Lisp files in elc.tar.gz. If that file already 162 # Backup compiled Lisp files in elc.tar.gz. If that file already
163 # exists, make a backup of it. 163 # exists, make a backup of it.
164 164