diff options
| -rw-r--r-- | Makefile.in | 79 |
1 files changed, 44 insertions, 35 deletions
diff --git a/Makefile.in b/Makefile.in index 66e0bed9cec..a79d8dffb11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -297,8 +297,7 @@ lwlib/Makefile: lwlib/Makefile.in config.status install: ${SUBDIR} install-arch-dep install-arch-indep blessmail @true -### Note that we copy the DOC-* files from the build etc directory -### as well as lots of things from ${srcdir}/etc. +### Install the executables that were compiled specifically for this machine. install-arch-dep: mkdir (cd lib-src; \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ @@ -309,47 +308,50 @@ install-arch-dep: mkdir rm -f ${bindir}/$(EMACS) -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS) -### Note that we copy the DOC-* files from the build etc directory -### as well as lots of things from ${srcdir}/etc. +### Install the files that are machine-independent. +### Most of them come straight from the distribution; +### the exception is the DOC-* files, which are copied +### from the build directory. + ### Note that we copy DOC* and then delete DOC ### as a workaround for a bug in tar on Ultrix 4.2. - install-arch-indep: mkdir -set ${COPYDESTS} ; \ - for dir in ${COPYDIR} ; do \ - if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ - rm -rf $$1 ; \ - fi ; \ - shift ; \ - done + for dir in ${COPYDIR} ; do \ + if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ + rm -rf $$1 ; \ + fi ; \ + shift ; \ + done -set ${COPYDESTS} ; \ - mkdir ${COPYDESTS} ; \ - chmod ugo+rx ${COPYDESTS} ; \ - for dir in ${COPYDIR} ; do \ - dest=$$1 ; shift ; \ - [ -d $${dir} ] \ - && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \ - && (echo "Copying $${dir} to $${dest}..." ; \ - (cd $${dir}; tar -cf - . )|(cd $${dest};umask 022; tar -xvf - ); \ - for subdir in `find $${dest} -type d ! -name RCS -print` ; do \ - rm -rf $${subdir}/RCS ; \ - rm -rf $${subdir}/CVS ; \ - rm -f $${subdir}/\#* ; \ - rm -f $${subdir}/.\#* ; \ - rm -f $${subdir}/*~ ; \ - rm -f $${subdir}/*.orig ; \ - rm -f $${subdir}/[mM]akefile* ; \ - rm -f $${subdir}/ChangeLog* ; \ - rm -f $${subdir}/dired.todo ; \ - done) ; \ - done + mkdir ${COPYDESTS} ; \ + chmod ugo+rx ${COPYDESTS} ; \ + for dir in ${COPYDIR} ; do \ + dest=$$1 ; shift ; \ + [ -d $${dir} ] \ + && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \ + && (echo "Copying $${dir} to $${dest}..." ; \ + (cd $${dir}; tar -cf - . )|(cd $${dest};umask 022; tar -xvf - ); \ + for subdir in `find $${dest} -type d ! -name RCS -print` ; do \ + rm -rf $${subdir}/RCS ; \ + rm -rf $${subdir}/CVS ; \ + rm -f $${subdir}/\#* ; \ + rm -f $${subdir}/.\#* ; \ + rm -f $${subdir}/*~ ; \ + rm -f $${subdir}/*.orig ; \ + rm -f $${subdir}/[mM]akefile* ; \ + rm -f $${subdir}/ChangeLog* ; \ + rm -f $${subdir}/dired.todo ; \ + done) ; \ + done -rm -f ${lispdir}/subdirs.el $(srcdir)/update-subdirs ${lispdir} + chmod -R a+r ${COPYDESTS} if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \ then \ echo "Copying etc/DOC-* to ${docdir} ..." ; \ (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \ - (cd $(docdir); rm DOC) \ + (cd $(docdir); chmod a+r DOC*; rm DOC) \ else true; fi thisdir=`/bin/pwd`; \ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ @@ -361,12 +363,19 @@ install-arch-indep: mkdir fi; \ cd ${srcdir}/info ; \ (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ + (cd $${thisdir}; chmod a+r ${infodir}/dir); \ for f in cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*; do \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \ + (cd $${thisdir}; \ + ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ + chmod a+r ${infodir}/$$f); \ done); \ else true; fi - thisdir=`/bin/pwd`; cd ${srcdir}/etc; for page in emacs etags ctags ; do \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}); \ + thisdir=`/bin/pwd`; \ + cd ${srcdir}/etc; \ + for page in emacs etags ctags ; do \ + (cd $${thisdir}; \ + ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ + chmod a+r ${man1dir}/$${page}${manext}); \ done ### Build all the directories we're going to install Emacs in. Since |