aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2007-07-28 08:11:17 +0000
committerEli Zaretskii2007-07-28 08:11:17 +0000
commit5311e2710bc28175fbfba99177f2ae2460024a43 (patch)
tree031ad37adf2995d68208ed4147c95790e3bd84be
parentfabbdc2f8419c81acfe42cf1eb0527d6ad00df3f (diff)
downloademacs-5311e2710bc28175fbfba99177f2ae2460024a43.tar.gz
emacs-5311e2710bc28175fbfba99177f2ae2460024a43.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 02f9513a5bc..306a37fd48a 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 2959c9d7e12..502e653ccec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -478,7 +478,7 @@ install-arch-indep: mkdir info
478 (cd ./etc; tar -chf - DOC*) \ 478 (cd ./etc; tar -chf - DOC*) \
479 |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ 479 |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
480 (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \ 480 (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
481 if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \ 481 if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \
482 else true; fi 482 else true; fi
483 -unset CDPATH; \ 483 -unset CDPATH; \
484 if [ -r ./lisp ] \ 484 if [ -r ./lisp ] \