aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-11 01:10:52 -0700
committerGlenn Morris2012-05-11 01:10:52 -0700
commite61249277b61b6601adfed28a96febdb549edc6c (patch)
tree69fe28093ed41fedf514f7cf0ed3d69462f7a86e
parenta873f274ba20ab4f54feac40f8b9fe6298fb315a (diff)
downloademacs-e61249277b61b6601adfed28a96febdb549edc6c.tar.gz
emacs-e61249277b61b6601adfed28a96febdb549edc6c.zip
* Makefile.in (install-arch-indep): Use INSTALL_DATA for the DOC file.
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.in7
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 61f29a9ee78..c6679465211 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
12012-05-11 Glenn Morris <rgm@gnu.org> 12012-05-11 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (install-arch-indep): There are no more Makefile.c files. 3 * Makefile.in (install-arch-indep): There are no more Makefile.c files.
4 Use INSTALL_DATA for the DOC file.
4 5
52012-05-10 Glenn Morris <rgm@gnu.org> 62012-05-10 Glenn Morris <rgm@gnu.org>
6 7
diff --git a/Makefile.in b/Makefile.in
index a8271f0ec9d..ac6ad2b5ac5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -455,6 +455,8 @@ MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
455### Install the executables that were compiled specifically for this machine. 455### Install the executables that were compiled specifically for this machine.
456### It would be nice to do something for a parallel make 456### It would be nice to do something for a parallel make
457### to ensure that install-arch-indep finishes before this starts. 457### to ensure that install-arch-indep finishes before this starts.
458### (TODO Why would it be nice? Why not just make this depend on
459### install-arch-indep then?)
458install-arch-dep: mkdir 460install-arch-dep: mkdir
459 (cd lib-src; \ 461 (cd lib-src; \
460 $(MAKE) install $(MFLAGS) prefix=${prefix} \ 462 $(MAKE) install $(MFLAGS) prefix=${prefix} \
@@ -579,11 +581,10 @@ install-arch-indep: mkdir info install-etc
579 docfile="DOC"; \ 581 docfile="DOC"; \
580 fi; \ 582 fi; \
581 echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \ 583 echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
582 (cd ./etc; tar -chf - $${docfile}) \ 584 ${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \
583 |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
584 (cd $(DESTDIR)$(docdir); \ 585 (cd $(DESTDIR)$(docdir); \
585 $(set_installuser); \ 586 $(set_installuser); \
586 chown $${installuser} DOC*; chmod a+r DOC*; \ 587 chown $${installuser} DOC*; \
587 if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \ 588 if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \
588 else true; fi 589 else true; fi
589 -unset CDPATH; \ 590 -unset CDPATH; \