comparison Makefile.in @ 89943:4c90ffeb71c5

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221 Restore deleted tagline in etc/TUTORIAL.ru * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229 Remove TeX output files from the archive * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248 src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-256 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275 Update from CVS: man/makefile.w32-in: Revert last change * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296 Allow restarting an existing debugger session that's exited * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-327 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328 Update from CVS: src/.gdbinit (xsymbol): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-329 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-344 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345 Tweak source regexps so that building in place won't cause problems * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-346 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-351 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-352 Update from CVS: lisp/flymake.el: New file. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362 Support " [...]" style defaults in minibuffer-electric-default-mode * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363 (read-number): Use canonical format for default in prompt. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368 Improve display-supports-face-attributes-p on non-ttys * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369 Rewrite face-differs-from-default-p * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370 Move `display-supports-face-attributes-p' entirely into C code * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372 Simplify face-differs-from-default-p; don't consider :stipple. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374 (tty_supports_face_attributes_p): Ensure attributes differ from default * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377 (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381 Face merging cleanups * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385 src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396 Tweak arch tagging to make build/install-in-place less annoying * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397 Work around vc-arch problems when building eshell * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398 Tweak permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399 Tweak directory permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401 More build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403 Yet more build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410 Make sure image types are initialized for lookup too * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416 Update from CVS
author Miles Bader <miles@gnu.org>
date Mon, 28 Jun 2004 07:56:49 +0000
parents 68c22ea6027c 126d50ddaff6
children 6f6e9fe4658b
comparison
equal deleted inserted replaced
89942:9cb747ae49af 89943:4c90ffeb71c5
257 -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ 257 -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \
258 -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ 258 -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \
259 -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ 259 -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \
260 -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \ 260 -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
261 -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \ 261 -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
262 -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ 262 -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
263 -e 's;/[*] *arch-tag:.*;/*;') && \
263 ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h 264 ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
264 265
265 # For parallel make, src should be build before leim. 266 # For parallel make, src should be build before leim.
266 # "export PARALLEL=0" is for SGI's Make, to prevent it from 267 # "export PARALLEL=0" is for SGI's Make, to prevent it from
267 # running more than 1 process in the leim directory, especially for 268 # running more than 1 process in the leim directory, especially for
443 -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el 444 -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
444 -unset CDPATH; \ 445 -unset CDPATH; \
445 if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \ 446 if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
446 then \ 447 then \
447 echo "Copying etc/DOC-* to ${docdir} ..." ; \ 448 echo "Copying etc/DOC-* to ${docdir} ..." ; \
448 (cd ./etc; tar -chf - DOC* compilation.txt) \ 449 (cd ./etc; tar -chf - DOC*) \
449 |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ 450 |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
450 (cd $(docdir); \ 451 (cd $(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
451 chown $${LOGNAME:-$$USERNAME} DOC* compilation.txt; \
452 chmod a+r DOC* compilation.txt; \
453 if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \ 452 if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
454 else true; fi 453 else true; fi
455 -unset CDPATH; \ 454 -unset CDPATH; \
456 if [ -r ./lisp ] \ 455 if [ -r ./lisp ] \
457 && [ -r ./lisp/simple.el ] \ 456 && [ -r ./lisp/simple.el ] \
473 (cd $${thisdir}; \ 472 (cd $${thisdir}; \
474 ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \ 473 ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \
475 chmod a+r ${infodir}/dir); \ 474 chmod a+r ${infodir}/dir); \
476 fi; \ 475 fi; \
477 cd ${srcdir}/info ; \ 476 cd ${srcdir}/info ; \
478 for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* ses* speedbar* tramp* vip* widget* woman* smtpmail*; do \ 477 for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* emacs-xtra* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* ses* speedbar* tramp* vip* widget* woman* smtpmail*; do \
479 (cd $${thisdir}; \ 478 (cd $${thisdir}; \
480 ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ 479 ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
481 chmod a+r ${infodir}/$$f); \ 480 chmod a+r ${infodir}/$$f); \
482 done); \ 481 done); \
483 else true; fi 482 else true; fi
484 -unset CDPATH; \ 483 -unset CDPATH; \
485 thisdir=`/bin/pwd`; \ 484 thisdir=`/bin/pwd`; \
486 if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ 485 if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
487 then \ 486 then \
488 for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc ses speedbar tramp vip viper widget woman smtpmail; do \ 487 for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime emacs-xtra eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc ses speedbar tramp vip viper widget woman smtpmail; do \
489 (cd $${thisdir}; \ 488 (cd $${thisdir}; \
490 ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \ 489 ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
491 done; \ 490 done; \
492 else true; fi 491 else true; fi
493 -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir} 492 -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
549 esac ; \ 548 esac ; \
550 fi ; \ 549 fi ; \
551 done 550 done
552 (cd ${archlibdir} && rm -f fns-*) 551 (cd ${archlibdir} && rm -f fns-*)
553 -rm -rf ${libexecdir}/emacs/${version} 552 -rm -rf ${libexecdir}/emacs/${version}
554 (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* ses* vip* smtpmail*) 553 (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* emacs-xtra* forms* gnus* info* mh-e* sc* ses* vip* smtpmail*)
555 (cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext}) 554 (cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
556 (cd ${bindir} && rm -f $(EMACSFULL) $(EMACS)) 555 (cd ${bindir} && rm -f $(EMACSFULL) $(EMACS))
557 556
558 557
559 FRC: 558 FRC:
753 (cd lib-src; $(MAKE) $(MFLAGS) clean) 752 (cd lib-src; $(MAKE) $(MFLAGS) clean)
754 -(cd man && $(MAKE) $(MFLAGS) clean) 753 -(cd man && $(MAKE) $(MFLAGS) clean)
755 -(cd lispref && $(MAKE) $(MFLAGS) clean) 754 -(cd lispref && $(MAKE) $(MFLAGS) clean)
756 -(cd lispintro && $(MAKE) $(MFLAGS) clean) 755 -(cd lispintro && $(MAKE) $(MFLAGS) clean)
757 (cd leim; $(MAKE) $(MFLAGS) clean) 756 (cd leim; $(MAKE) $(MFLAGS) clean)
758
759 # arch-tag: c1162ff6-e0a8-4366-bc1a-2eb544007156