X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/969f17355762d9ace52a38c490a2282b27ad8089..80128ceb0479868600b90eb9f1eddcf102d72cdb:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 7ecd8985be..66e0bed9ce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,7 +22,7 @@ # `make distclean' should leave only the files that were in the # distribution. # -# make realclean +# make maintainer-clean # Delete everything from the current directory that can be # reconstructed with this Makefile. This typically includes # everything deleted by distclean, plus more: C source files @@ -82,16 +82,17 @@ datadir=@datadir@ # runs. These files are all architecture-independent. Right now, the # only such data is the locking directory; ${lockdir} is a # subdirectory of this. -statedir=@statedir@ +sharedstatedir=@sharedstatedir@ # Where to install and expect executable files to be run by Emacs # rather than directly by users, and other architecture-dependent # data. ${archlibdir} is a subdirectory of this. -libdir=@libdir@ +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 @@ -99,6 +100,9 @@ manext=.1 # system, it is inappropriate to imply that it is part of Emacs. infodir=@infodir@ +# Where to look for bitmap files. +bitmapdir=@bitmapdir@ + # Where to find the source code. The source code for Emacs's C kernel is # expected to be in ${srcdir}/src, and the source code for Emacs's # utility programs is expected to be in ${srcdir}/lib-src. This is @@ -183,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. @@ -198,40 +202,45 @@ 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}";' \ -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ + -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. -paths-force: FRC - @echo "Producing \`src/paths.h' from \`src/paths.h.in'." +# 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.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}";' \ -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ + -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 @@ -249,12 +258,13 @@ ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' blessmail: ${SUBDIR_MAKEFILES} src FRC - cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) MAKE='${MAKE}' + cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \ + MAKE='${MAKE}' archlibdir='$(archlibdir)' 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 @@ -284,15 +294,16 @@ 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. install-arch-dep: mkdir (cd lib-src; \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ - exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ - archlibdir=${archlibdir}) + exec_prefix=${exec_prefix} bindir=${bindir} \ + libexecdir=${libexecdir} archlibdir=${archlibdir}) ${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version} -chmod 1755 ${bindir}/emacs-${version} rm -f ${bindir}/$(EMACS) @@ -300,6 +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. + install-arch-indep: mkdir -set ${COPYDESTS} ; \ for dir in ${COPYDIR} ; do \ @@ -310,48 +324,60 @@ install-arch-indep: mkdir 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 ### we may be creating several layers of directories (for example, -### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use make-path -### instead of mkdir. Not all systems' mkdirs have the `-p' flag. +### /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 - ./lib-src/make-path ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \ - ${bindir} ${datadir} ${docdir} ${libdir} \ + $(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 @@ -362,7 +388,7 @@ uninstall: (cd lib-src; \ $(MAKE) $(MFLAGS) uninstall \ prefix=${prefix} exec_prefix=${exec_prefix} \ - bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir}) + bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}) for dir in ${lispdir} ${etcdir} ; do \ if [ -d $${dir} ]; then \ case `(cd $${dir} ; /bin/pwd)` in \ @@ -376,16 +402,16 @@ uninstall: esac ; \ fi ; \ done - (cd ${infodir}; rm -f cl* emacs* forms* info* vip*) - (cd ${mandir}; rm -f emacs.1 etags.1 ctags.1) - (cd ${bindir}; rm -f emacs-${version} $(EMACS)) + (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)) FRC: # ==================== Cleaning up and miscellanea ==================== -.PHONY: mostlyclean clean distclean realclean extraclean +.PHONY: mostlyclean clean distclean maintainer-clean extraclean ### `mostlyclean' ### Like `clean', but may refrain from deleting a few files that people @@ -421,9 +447,9 @@ clean: FRC ### `make distclean' should leave only the files that were in the ### distribution. top_distclean=\ - rm -f config.status build-install ; \ + rm -f config.status config.cache config.log ; \ rm -f Makefile ${SUBDIR_MAKEFILES} ; \ - (cd lock ; rm -f *) + (cd lock && rm -f *) distclean: FRC (cd src; $(MAKE) $(MFLAGS) distclean) (cd oldXMenu; $(MAKE) $(MFLAGS) distclean) @@ -431,25 +457,24 @@ distclean: FRC (cd lib-src; $(MAKE) $(MFLAGS) distclean) (cd man && $(MAKE) $(MFLAGS) distclean) ${top_distclean} - -### `realclean' +### `maintainer-clean' ### Delete everything from the current directory that can be ### reconstructed with this Makefile. This typically includes ### everything deleted by distclean, plus more: C source files ### produced by Bison, tags tables, info files, and so on. ### -### One exception, however: `make realclean' should not delete +### One exception, however: `make maintainer-clean' should not delete ### `configure' even if `configure' can be remade using a rule in the -### Makefile. More generally, `make realclean' should not delete +### Makefile. More generally, `make maintainer-clean' should not delete ### anything that needs to exist in order to run `configure' and then ### begin to build the program. -realclean: FRC - (cd src; $(MAKE) $(MFLAGS) realclean) - (cd oldXMenu; $(MAKE) $(MFLAGS) realclean) - (cd lwlib; $(MAKE) $(MFLAGS) realclean) - (cd lib-src; $(MAKE) $(MFLAGS) realclean) - -(cd man && $(MAKE) $(MFLAGS) realclean) +maintainer-clean: FRC + (cd src; $(MAKE) $(MFLAGS) maintainer-clean) + (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean) + (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) + (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) + -(cd man && $(MAKE) $(MFLAGS) maintainer-clean) ${top_distclean} ### This doesn't actually appear in the coding standards, but Karl @@ -458,7 +483,7 @@ realclean: FRC ### it deletes backup and autosave files too. extraclean: for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done - -(cd lock; rm *) + -(cd lock && rm *) -rm config.status config-tmp-* -rm -f *~ \#* @@ -473,7 +498,7 @@ extraclean: ### and VC will swiftly let you know if this happens, and it is easily ### corrected. SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \ - README build-install.in configure make-dist move-if-change + README configure make-dist move-if-change .PHONY: unlock relock @@ -508,6 +533,7 @@ check: @echo "We don't have any tests for GNU Emacs yet." dist: + $(srcdir)/update-subdirs ${srcdir}/lisp cd ${srcdir}; make-dist .PHONY: info dvi dist check @@ -515,4 +541,4 @@ force-info: info: force-info (cd ${srcdir}/man; $(MAKE) $(MFLAGS) info) dvi: - (cd ${srcdir}/man; $(MAKE) $(MFLAGS) dvi) + (cd man; $(MAKE) $(MFLAGS) dvi)