aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2007-07-28 08:13:00 +0000
committerEli Zaretskii2007-07-28 08:13:00 +0000
commit664a406f0202130158ff4540f453f5e5385fc41b (patch)
treea41c4f8c8cbe0879e84acfa77601f6e3b0ef60cc
parent59b65f0076a44c6e899dd8c40e4a687ec91aa342 (diff)
downloademacs-664a406f0202130158ff4540f453f5e5385fc41b.tar.gz
emacs-664a406f0202130158ff4540f453f5e5385fc41b.zip
(install-arch-indep): Use "rm -f" for removing DOC, to avoid an error message
if there is no DOC there.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f4780bbb768..f6a4b9e426d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12007-07-28 Eli Zaretskii <eliz@gnu.org>
2
3 * Makefile.in (install-arch-indep): Use "rm -f" for removing DOC,
4 to avoid an error message if there is no DOC there.
5
12007-07-25 Glenn Morris <rgm@gnu.org> 62007-07-25 Glenn Morris <rgm@gnu.org>
2 7
3 * Relicense all FSF files to GPLv3 or later. 8 * Relicense all FSF files to GPLv3 or later.
diff --git a/Makefile.in b/Makefile.in
index 8f4ba68c178..ec93805a0e9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -483,7 +483,7 @@ install-arch-indep: mkdir info
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 ] \