X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b45949948b7b427c740298ca45ac80dd866e183c..80128ceb0479868600b90eb9f1eddcf102d72cdb:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 2e76033c57..66e0bed9ce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -92,6 +92,7 @@ libexecdir=@libexecdir@ # Where to install Emacs's man pages, and what extension they should have. mandir=@mandir@ manext=.1 +man1dir=$(mandir)/man1 # Where to install and expect the info files describing Emacs. In the # past, this defaulted to a subdirectory of ${prefix}/lib/emacs, but @@ -186,7 +187,7 @@ EMACS = emacs SUBDIR = lib-src src # The makefiles of the directories in $SUBDIR. -SUBDIR_MAKEFILES = lib-src/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile +SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile # Subdirectories to install, and where they'll go. # lib-src's makefile knows how to install it, so we don't do that here. @@ -201,11 +202,11 @@ all: paths-force ${SUBDIR} removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' # Note that sed is not in /bin on 386bsd. -src/paths.h: Makefile ${srcdir}/src/paths.h.in - @echo "Producing \`src/paths.h' from \`src/paths.h.in'." +src/paths.h: Makefile ${srcdir}/src/paths.in + @echo "Producing \`src/paths.h' from \`src/paths.in'." @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ - sed < ${srcdir}/src/paths.h.in > paths.h.tmp$$$$ \ + sed < ${srcdir}/src/paths.in > paths.h.$$$$ \ -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ @@ -214,23 +215,23 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') && \ - ${srcdir}/move-if-change paths.h.tmp$$$$ src/paths.h + ${srcdir}/move-if-change paths.h.$$$$ src/paths.h # For `make all', # we force the rebuilding of src/paths.h because the user might give # make different values for the various directories. Since we use # move-if-change, src/paths.h only actually changes if the user did # something notable, so the only unnecessary work we do is in building -# paths.h.tmp$$$$, which isn't much. +# paths.h.$$, which isn't much. # Note that sed is not in /bin on 386bsd. # We depend on src/paths.h here to prevent simultaneous execution of # that rule and this one, in a parallel make. # It is possible for paths.h to be updated twice--but that would happen anyway. paths-force: FRC src/paths.h - @echo "Producing \`src/paths.h' from \`src/paths.h.in'." + @echo "Producing \`src/paths.h' from \`src/paths.in'." @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ - sed < ${srcdir}/src/paths.h.in > paths.h.tmp$$$$ \ + sed < ${srcdir}/src/paths.in > paths.h.$$$$ \ -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ @@ -239,7 +240,7 @@ paths-force: FRC src/paths.h -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') && \ - ${srcdir}/move-if-change paths.h.tmp$$$$ src/paths.h + ${srcdir}/move-if-change paths.h.$$$$ src/paths.h src: lib-src FRC src/paths.h @@ -263,7 +264,7 @@ blessmail: ${SUBDIR_MAKEFILES} src FRC Makefile: Makefile.in config.status ./config.status -src/Makefile: src/Makefile.in.in config.status +src/Makefile: src/Makefile.in config.status ./config.status lib-src/Makefile: lib-src/Makefile.in config.status @@ -293,7 +294,8 @@ lwlib/Makefile: lwlib/Makefile.in config.status ## source exists and is distinct from the destination. ## We don't depend on `all', but rather on ${SUBDIR}, so that we won't ## ever modify src/paths.h. -install: ${SUBDIR} install-arch-dep install-arch-indep blessmail; +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. @@ -309,11 +311,9 @@ install-arch-dep: mkdir ### Note that we copy the DOC-* files from the build etc directory ### as well as lots of things from ${srcdir}/etc. +### Note that we copy DOC* and then delete DOC +### as a workaround for a bug in tar on Ultrix 4.2. -# These lines appeared after the second -set, but should be unnecessary. -# mkdir ${COPYDESTS} ; \ -# chmod ugo+rx ${COPYDESTS} ; \ -# The backslash above continues the comment onto this line. It ends here. install-arch-indep: mkdir -set ${COPYDESTS} ; \ for dir in ${COPYDIR} ; do \ @@ -323,40 +323,50 @@ install-arch-indep: mkdir 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}..." ; \ + && (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} if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \ then \ - echo "Copying etc/DOC-* ..." ; \ - (cd etc; tar -cf - DOC-*)|(cd ${docdir}; umask 0; tar -xvf - ); \ + echo "Copying etc/DOC-* to ${docdir} ..." ; \ + (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \ + (cd $(docdir); rm DOC) \ else true; fi thisdir=`/bin/pwd`; \ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ then \ - (cd ${srcdir}/info ; \ - if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ - fi ; \ - for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* ; do \ + (cd ${infodir}; \ + if [ -f dir ]; then \ + if [ ! -f dir.old ]; then mv -f dir dir.old; \ + else mv -f dir dir.bak; fi; \ + fi; \ + cd ${srcdir}/info ; \ + (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${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); \ 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 ${mandir}/$${page}${manext}); \ + (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}); \ done ### Build all the directories we're going to install Emacs in. Since @@ -364,10 +374,10 @@ install-arch-indep: mkdir ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs ### instead of mkdir. Not all systems' mkdir programs have the `-p' flag. mkdir: FRC - $(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \ + $(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${man1dir} \ ${bindir} ${datadir} ${docdir} ${libexecdir} \ `echo ${locallisppath} | sed 's/:/ /g'` - -chmod 777 ${lockdir} + -chmod a+rwx ${lockdir} ### Delete all the installed files that the `install' target would ### create (but not the noninstalled files such as `make all' would @@ -392,8 +402,8 @@ uninstall: esac ; \ fi ; \ done - (cd ${infodir} && rm -f cl* emacs* forms* info* vip*) - (cd ${mandir} && rm -f emacs.1 etags.1 ctags.1) + (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*) + (cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1) (cd ${bindir} && rm -f emacs-${version} $(EMACS)) @@ -437,7 +447,7 @@ clean: FRC ### `make distclean' should leave only the files that were in the ### distribution. top_distclean=\ - rm -f config.status ; \ + rm -f config.status config.cache config.log ; \ rm -f Makefile ${SUBDIR_MAKEFILES} ; \ (cd lock && rm -f *) distclean: FRC @@ -447,7 +457,6 @@ distclean: FRC (cd lib-src; $(MAKE) $(MFLAGS) distclean) (cd man && $(MAKE) $(MFLAGS) distclean) ${top_distclean} - ### `maintainer-clean' ### Delete everything from the current directory that can be