X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2dcc73bca70096848e4f51530f8084973c19f530..95a60dc06b2d05485a702e62ee00834a71753922:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 13b452d30d..a29fd35334 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,4 @@ -# DIST: This is the distribution Makefile for Emacs. configure can -# DIST: make most of the changes to this file you might want, so try -# DIST: that first. +### @configure_input@ # Copyright (C) 1992-2013 Free Software Foundation, Inc. @@ -235,8 +233,8 @@ etcdir=@etcdir@ # once. archlibdir=@archlibdir@ -# Where to put the docstring file. -docdir=@docdir@ +# Where to put the etc/DOC file. +etcdocdir=@etcdocdir@ # Where to install Emacs game score files. gamedir=@gamedir@ @@ -293,7 +291,7 @@ all: ${SUBDIR} .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC -removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' +removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g' # Generate epaths.h from epaths.in. This target is invoked by `configure'. # See comments in configure.ac for why it is done this way, as opposed @@ -315,17 +313,40 @@ epaths-force: FRC -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \ -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \ - -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ + -e 's;\(#.*PATH_DOC\).*$$;\1 "${etcdocdir}";') && \ ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h -# Convert MSYS-style /x/foo file name into x:/foo that Windows can grok. -msys_to_w32=sed -e 's,^/\([A-Za-z]\)/,\1:/,' +# Convert MSYS-style /x/foo or Windows-style x:\foo file names +# into x:/foo that Windows can grok. +msys_to_w32=sed -e 's,\\\\,/,g' -e 's,^/\([A-Za-z]\)/,\1:/,' + +# Transform directory search path and its components. Original can +# be MSYS or Windows style. Set path separator to ";", directory +# separator to "/" and transform MSYS-style "/c/" to "c:/". +# Remove empty path components and escape semicolons. +msys_lisppath_to_w32=sed -e 's,\\\\,/,g' \ + -e 's,\(^\|[:;]\)\([A-Za-z]\):/,\1/\2/,g' \ + -e 's/:/;/g' -e 's,\(^\|;\)/\([A-Za-z]\)/,\1\2:/,g' \ + -e 's/;\+/;/g' -e 's/^;//' -e 's/;$$//' -e 's/;/\\\\;/g' + +# Replace "${prefix}" with '%emacs_dir%' (which expands to install +# directory at runtime). +msys_prefix_subst=sed -e 's!\(^\|;\)'"$${prefixpattern}"'\([;/]\|$$\)!\1%emacs_dir%\2!g' + +# Quote Sed special characters (except backslash and newline) with +# a double backslash. +msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g' # The w32 build needs a slightly different editing, and it uses # nt/epaths.nt as the template. +# Use the value of ${locallisppath} supplied by `configure', +# to support the --enable-locallisppath argument. epaths-force-w32: FRC @(w32srcdir=`echo "${srcdir}" | ${msys_to_w32}` ; \ + prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \ + locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} | ${msys_prefix_subst}` ; \ sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \ + -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${locallisppath}"'";' \ -e '/^.*#/s/@VER@/${version}/g' \ -e '/^.*#/s/@CFG@/${configuration}/g' \ -e "/^.*#/s|@SRC@|$${w32srcdir}|g") && \ @@ -432,7 +453,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) # ==================== Installation ==================== -.PHONY: install install-arch-dep install-arch-indep install-doc install-info +.PHONY: install install-arch-dep install-arch-indep install-etcdoc install-info .PHONY: install-man install-etc install-strip install-$(NTDIR) .PHONY: uninstall uninstall-$(NTDIR) @@ -440,7 +461,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) ## don't have to duplicate the list of utilities to install in ## this Makefile as well. -install: all install-arch-indep install-doc install-arch-dep install-$(NTDIR) blessmail +install: all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR) blessmail @true ## Ensure that $subdir contains a subdirs.el file. @@ -461,7 +482,7 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \ ### Install the executables that were compiled specifically for this machine. ### We do install-arch-indep first because the executable needs the ### Lisp files and DOC file to work properly. -install-arch-dep: src install-arch-indep install-doc install-$(NTDIR) +install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR) umask 022; ${MKDIR_P} $(DESTDIR)${bindir} cd lib-src && \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ @@ -520,18 +541,19 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ ## We delete etc/DOC* because there may be irrelevant DOC files from ## other builds in the source directory. This is ok because we just ## deleted the entire installed etc/ directory and recreated it. -## install-doc installs the relevant DOC. +## install-etcdoc installs the relevant DOC. + +## Note that we install etc/refcards/*.ps if present. +## TODO we should compress these if GZIP_PROG is set. +## It would be simpler to have a separate install rule for etc/refcards +## (maybe move it to doc/refcards?). ## Note that the Makefiles in the etc directory are potentially useful ## in an installed Emacs, so should not be excluded. -## I'm not sure creating locallisppath here serves any useful purpose. -## If it has the default value, then the later write_subdir commands -## will ensure all these components exist. -## This will only do something if locallisppath has a non-standard value. -## Is it really Emacs's job to create those directories? -## Should we also be ensuring they contain subdirs.el files? -## It would be easy to do, just use write_subdir. +## We used to create locallisppath, but if it points to non-standard +## locations, is not really Emacs's job to create these directories, +## so it is no longer done. ## Note that we use tar instead of plain old cp -R/-r because the latter ## is apparently not portable (even in 2012!). @@ -541,12 +563,6 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ ## See also these comments from 2004 about cp -r working fine: ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} - umask 022 ; \ - locallisppath='${locallisppath}'; \ - IFS=:; \ - for d in $$locallisppath; do \ - ${MKDIR_P} "$(DESTDIR)$$d"; \ - done -set ${COPYDESTS} ; \ unset CDPATH; \ $(set_installuser); \ @@ -567,7 +583,12 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR (cd $${dir}; tar -chf - . ) \ | (cd $${dest}; umask 022; \ tar -xvf - && cat > /dev/null) || exit 1; \ - [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ + if [ "$${dir}" = "${srcdir}/etc" ]; then \ + rm -f $${dest}/DOC* ; \ + rm -f $${dest}/refcards/*.aux $${dest}/refcards/*.dvi; \ + rm -f $${dest}/refcards/*.log; \ + else true; \ + fi; \ for subdir in `find $${dest} -type d -print` ; do \ chmod a+rx $${subdir} ; \ rm -f $${subdir}/.gitignore ; \ @@ -608,28 +629,18 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR ## guaranteed to do the right thing; eg if we are root and tar is ## preserving source permissions. -## We install only the relevant DOC file if possible -## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. -## (Note "otherwise" is inaccurate since 2009-08-23.) - ## Note that install-arch-indep deletes and recreates the entire ## installed etc/ directory, so we need it to run before this does. -install-doc: src install-arch-indep +install-etcdoc: src install-arch-indep -unset CDPATH; \ - umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \ - if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \ + umask 022; ${MKDIR_P} $(DESTDIR)${etcdocdir} ; \ + if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${etcdocdir}; /bin/pwd` ]; \ then \ - fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \ - if [ -f "./etc/DOC-$${fullversion}" ]; \ - then \ - docfile="DOC-$${fullversion}"; \ - else \ - docfile="DOC"; \ - fi; \ - echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \ - ${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \ + docfile="DOC"; \ + echo "Copying etc/$${docfile} to $(DESTDIR)${etcdocdir} ..." ; \ + ${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${etcdocdir}/$${docfile}; \ $(set_installuser); \ - chown $${installuser} $(DESTDIR)${docdir}/$${docfile} || true ; \ + chown $${installuser} $(DESTDIR)${etcdocdir}/$${docfile} || true ; \ else true; fi install-info: info @@ -715,7 +726,7 @@ install-strip: ### create (but not the noninstalled files such as `make all' would create). ### ### Don't delete the lisp and etc directories if they're in the source tree. -uninstall: uninstall-$(NTDIR) +uninstall: uninstall-$(NTDIR) uninstall-doc cd lib-src && \ $(MAKE) $(MFLAGS) uninstall \ prefix=${prefix} exec_prefix=${exec_prefix} \ @@ -848,6 +859,9 @@ distclean: FRC (cd leim; $(MAKE) $(MFLAGS) distclean) (cd lisp; $(MAKE) $(MFLAGS) distclean) (cd nextstep && $(MAKE) $(MFLAGS) distclean) + [ ! -d test/automated ] || { \ + cd test/automated && $(MAKE) $(MFLAGS) distclean; \ + } ${top_distclean} ### `bootstrap-clean' @@ -867,6 +881,9 @@ bootstrap-clean: FRC (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean) + [ ! -d test/automated ] || { \ + cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean; \ + } [ ! -f config.log ] || mv -f config.log config.log~ ${top_bootclean} @@ -887,6 +904,9 @@ top_maintainer_clean=\ maintainer-clean: bootstrap-clean FRC (cd src; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) + [ ! -d test/automated ] || { \ + cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean; \ + } ${top_maintainer_clean} ### This doesn't actually appear in the coding standards, but Karl @@ -920,7 +940,7 @@ DVIS = lispref-dvi lispintro-dvi emacs-dvi misc-dvi HTMLS = lispref-html lispintro-html emacs-html misc-html INFOS = lispref-info lispintro-info emacs-info misc-info PDFS = lispref-pdf lispintro-pdf emacs-pdf misc-pdf -PSS = lispref-ps lispintro-ps emacs-ps # no misc-ps +PSS = lispref-ps lispintro-ps emacs-ps misc-ps DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS) $(DOCS): @@ -929,6 +949,7 @@ $(DOCS): .PHONY: $(DOCS) docs pdf ps .PHONY: info dvi dist check html info-real force-info check-info-dir +## TODO add etc/refcards. docs: $(DOCS) dvi: $(DVIS) html: $(HTMLS) @@ -936,6 +957,55 @@ info-real: $(INFOS) pdf: $(PDFS) ps: $(PSS) + +INSTALL_DVI = install-emacs-dvi install-lispref-dvi \ + install-lispintro-dvi install-misc-dvi +INSTALL_HTML = install-emacs-html install-lispref-html \ + install-lispintro-html install-misc-html +INSTALL_PDF = install-emacs-pdf install-lispref-pdf \ + install-lispintro-pdf install-misc-pdf +INSTALL_PS = install-emacs-ps install-lispref-ps \ + install-lispintro-ps install-misc-ps +INSTALL_DOC = $(INSTALL_DVI) $(INSTALL_HTML) $(INSTALL_PDF) $(INSTALL_PS) + +## Install non .info forms of the documentation. +## TODO add etc/refcards. +$(INSTALL_DOC): + t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $(MFLAGS) $$1-$$3 + +.PHONY: $(INSTALL_DOC) install-doc +.PHONY: install-dvi install-html install-pdf install-ps + +install-doc: $(INSTALL_DOC) +install-dvi: $(INSTALL_DVI) +install-html: $(INSTALL_HTML) +install-pdf: $(INSTALL_PDF) +install-ps: $(INSTALL_PS) + + +UNINSTALL_DVI = uninstall-emacs-dvi uninstall-lispref-dvi \ + uninstall-lispintro-dvi uninstall-misc-dvi +UNINSTALL_HTML = uninstall-emacs-html uninstall-lispref-html \ + uninstall-lispintro-html uninstall-misc-html +UNINSTALL_PDF = uninstall-emacs-pdf uninstall-lispref-pdf \ + uninstall-lispintro-pdf uninstall-misc-pdf +UNINSTALL_PS = uninstall-emacs-ps uninstall-lispref-ps \ + uninstall-lispintro-ps uninstall-misc-ps +UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF) $(UNINSTALL_PS) + +$(UNINSTALL_DOC): + t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $(MFLAGS) $$1-$$3 + +.PHONY: $(UNINSTALL_DOC) uninstall-doc +.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps + +uninstall-doc: $(UNINSTALL_DOC) +uninstall-dvi: $(UNINSTALL_DVI) +uninstall-html: $(UNINSTALL_HTML) +uninstall-pdf: $(UNINSTALL_PDF) +uninstall-ps: $(UNINSTALL_PS) + + force-info: # Note that man/Makefile knows how to put the info files in $(srcdir), # so we can do ok running make in the build dir.