diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-27 09:21:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-27 09:21:49 +0000 |
| commit | 62fb5e25f4a4c7da6fe6a06569b22a27998ae6bf (patch) | |
| tree | 9e21647ad3ab0f43ea02d372adc4cfa9947e5309 /lib-src | |
| parent | 9005667b3381a785759a996e00fb1acfd126eecc (diff) | |
| parent | 83cc8d356afe3bfd68da74b822549e02047ed041 (diff) | |
| download | emacs-62fb5e25f4a4c7da6fe6a06569b22a27998ae6bf.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-862)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 2f4b58ab7a6..9d7d076ca46 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2007-08-25 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (rcs2log, rcs-checkin, grep-changelog, vcdiff): + Prepend "-" to the command, in case srcdir=. and file is copied + into itself. + 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 1482ea6c5df..5d8da71dbdd 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -268,18 +268,21 @@ BASE_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \ all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} /* These targets copy the scripts into the build directory -so that they can be run from there in an uninstalled Emacs. */ +so that they can be run from there in an uninstalled Emacs. +The "-" is prepended because some versions of cp barf when +srcdir is the current directory, and thus the file will be +copied into itself. */ rcs2log: $(srcdir)/rcs2log - cp -p $(srcdir)/rcs2log rcs2log + -cp -p $(srcdir)/rcs2log rcs2log rcs-checkin: $(srcdir)/rcs-checkin - cp -p $(srcdir)/rcs-checkin rcs-checkin + -cp -p $(srcdir)/rcs-checkin rcs-checkin grep-changelog: $(srcdir)/grep-changelog - cp -p $(srcdir)/grep-changelog grep-changelog + -cp -p $(srcdir)/grep-changelog grep-changelog vcdiff: $(srcdir)/vcdiff - cp -p $(srcdir)/vcdiff vcdiff + -cp -p $(srcdir)/vcdiff vcdiff #ifdef MOVEMAIL_NEEDS_BLESSING blessmail: |