Mercurial > emacs
comparison Makefile.in @ 83648:65663fcd2caa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-838)
- Update from CVS
- Merge from emacs--rel--22
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Restore lisp/emacs-lisp/cl-loaddefs.el
* emacs--rel--22 (patch 70-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 31 Jul 2007 05:50:45 +0000 |
parents | 9cbc38ee05d2 |
children | 69a5b7649f84 539530fa389c |
comparison
equal
deleted
inserted
replaced
83647:3468e549a55b | 83648:65663fcd2caa |
---|---|
7 | 7 |
8 # This file is part of GNU Emacs. | 8 # This file is part of GNU Emacs. |
9 | 9 |
10 # GNU Emacs is free software; you can redistribute it and/or modify | 10 # GNU Emacs is free software; you can redistribute it and/or modify |
11 # it under the terms of the GNU General Public License as published by | 11 # it under the terms of the GNU General Public License as published by |
12 # the Free Software Foundation; either version 2, or (at your option) | 12 # the Free Software Foundation; either version 3, or (at your option) |
13 # any later version. | 13 # any later version. |
14 | 14 |
15 # GNU Emacs is distributed in the hope that it will be useful, | 15 # GNU Emacs is distributed in the hope that it will be useful, |
16 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 16 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
17 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 17 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
481 fi; \ | 481 fi; \ |
482 echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \ | 482 echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \ |
483 (cd ./etc; tar -chf - $${docfile}) \ | 483 (cd ./etc; tar -chf - $${docfile}) \ |
484 |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ | 484 |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ |
485 (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \ | 485 (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \ |
486 if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \ | 486 if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \ |
487 else true; fi | 487 else true; fi |
488 -unset CDPATH; \ | 488 -unset CDPATH; \ |
489 if [ -r ./lisp ] \ | 489 if [ -r ./lisp ] \ |
490 && [ -r ./lisp/simple.el ] \ | 490 && [ -r ./lisp/simple.el ] \ |
491 && [ x`(cd ./lisp; /bin/pwd)` != x`(cd $(DESTDIR)${lispdir}; /bin/pwd)` ] \ | 491 && [ x`(cd ./lisp; /bin/pwd)` != x`(cd $(DESTDIR)${lispdir}; /bin/pwd)` ] \ |