X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/4e7d487c440666d5178e78d66ef4c3c232c01a19..562d4436bce90adc8535aeb2b9b1517952ee67ad:/Makefile.in diff --git a/Makefile.in b/Makefile.in index b0ea80e8b9..ab9f16c035 100644 --- a/Makefile.in +++ b/Makefile.in @@ -66,10 +66,8 @@ CDPATH= # ==================== Things `configure' Might Edit ==================== -MAINTAINER_MODE_FLAG = --disable-maintainer-mode -@MAINT@MAINTAINER_MODE_FLAG = --enable-maintainer-mode cache_file = @cache_file@ -CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG) +CONFIGURE_FLAGS = --cache-file=$(cache_file) CC=@CC@ CFLAGS=@CFLAGS@ @@ -90,6 +88,13 @@ configuration=@configuration@ # ==================== Where To Install Things ==================== +# Location to install Emacs.app under GNUstep / Mac OS X. +# Later values may use these. +ns_appbindir=@ns_appbindir@ +ns_appresdir=@ns_appresdir@ +# Either yes or no depending on whether this is a relocatable Emacs.app. +ns_self_contained=@ns_self_contained@ + # The default location for installation. Everything is placed in # subdirectories of this directory. The default values for many of # the variables below are expressed in terms of this one, so you may @@ -117,8 +122,10 @@ datadir=@datadir@ 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. +# rather than directly by users (and other architecture-dependent +# data, although Emacs does not have any). The executables +# are actually installed in ${archlibdir}, which is (normally) +# a subdirectory of this. libexecdir=@libexecdir@ # Where to install Emacs's man pages. @@ -158,10 +165,6 @@ VPATH=@srcdir@ # Where to find the application default. x_default_search_path=@x_default_search_path@ -# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa -ns_appbindir=@ns_appbindir@ -ns_appresdir=@ns_appresdir@ - # Where the etc/emacs.desktop file is to be installed. desktopdir=$(datarootdir)/applications @@ -176,22 +179,27 @@ iconsrcdir=$(srcdir)/etc/images/icons # These variables hold the values Emacs will actually use. They are # based on the values of the standard Make variables above. -# Where to install the lisp files distributed with +# Where to install the lisp, leim files distributed with # Emacs. This includes the Emacs version, so that the # lisp files for different versions of Emacs will install # themselves in separate directories. lispdir=@lispdir@ +leimdir=@leimdir@ + +# Directories Emacs should search for standard lisp files. +# The default is ${lispdir}:${leimdir}. +standardlisppath=@standardlisppath@ -# Directories Emacs should search for lisp files specific -# to this site (i.e. customizations), before consulting -# ${lispdir}. This should be a colon-separated list of -# directories. +# Directories Emacs should search for lisp files specific to this +# site (i.e. customizations), before consulting ${standardlisppath}. +# This should be a colon-separated list of directories. locallisppath=@locallisppath@ # Where Emacs will search to find its lisp files. Before # changing this, check to see if your purpose wouldn't # better be served by changing locallisppath. This # should be a colon-separated list of directories. +# The default is ${locallisppath}:${standardlisppath}. lisppath=@lisppath@ # Where Emacs will search for its lisp files while @@ -253,14 +261,8 @@ TRANSFORM = @program_transform_name@ EMACS = `echo emacs${EXEEXT} | sed '$(TRANSFORM)'` EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'` -# Subdirectories to make recursively. `lisp' is not included -# because the compiled lisp files are part of the distribution. -# leim is not included because it needs special handling. -# -# Actually, we now include `lisp' as well, since the compiled files -# are not included any more in case of bootstrap or in case Emacs was -# checked out from a VCS. -SUBDIR = lib lib-src src lisp +# Subdirectories to make recursively. +SUBDIR = lib lib-src src lisp leim # The subdir makefiles created by config.status. SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ @@ -268,28 +270,31 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'` # Subdirectories to install, and where they'll go. # lib-src's makefile knows how to install it, so we don't do that here. -# leim's makefile also knows how to install it, so we don't do that here. -# When installing the info files, we need to do special things to -# avoid nuking an existing dir file, so we don't do that here; -# instead, we have written out explicit code in the `install' targets. -COPYDIR = ${srcdir}/etc ${srcdir}/lisp -COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} +# Directories that cannot simply be copied, eg info, +# are treated separately. +# quail appears twice because in out-of-tree builds, it exists twice. +COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail +COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail + +all: ${SUBDIR} -all: ${SUBDIR} leim +.PHONY: all ${SUBDIR} blessmail epaths-force FRC removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' # Generate epaths.h from epaths.in. This target is invoked by `configure'. -# See comments in configure.in for why it is done this way, as opposed +# See comments in configure.ac for why it is done this way, as opposed # to just letting configure generate epaths.h from epaths.in in a # similar way to how Makefile is made from Makefile.in. epaths-force: FRC - @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ - buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ + @(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \ + locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \ + buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \ x_default_search_path=`echo ${x_default_search_path}`; \ gamedir=`echo ${gamedir}`; \ sed < ${srcdir}/src/epaths.in > epaths.h.$$$$ \ - -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'"$${lisppath}"'";' \ + -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'"$${standardlisppath}"'";' \ + -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${locallisppath}"'";' \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'"$${buildlisppath}"'";' \ -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ @@ -300,62 +305,17 @@ epaths-force: FRC -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h -# For parallel make, src should be built before leim. -# "export PARALLEL=0" is for SGI's Make, to prevent it from -# running more than 1 process in the leim directory, especially for -# the $TIT files there. -leim: src Makefile FRC - cd leim && PARALLEL=0 $(MAKE) all $(MFLAGS) - lib-src src: lib src: lib-src FRC -.RECURSIVE: ${SUBDIR} leim - -# We need to build `emacs' in `src' to compile the *.elc files in `lisp'. -lisp: src - -# Maintainers can put a copy of gnulib into $(gnulib_srcdir). -gnulib_srcdir = ../gnulib -$(gnulib_srcdir): - git clone git://git.savannah.gnu.org/gnulib.git $@ - -# A shorter name that satisfies MS-DOS 8+3 constraints. -DOS_gnulib_comp.m4 = gl-comp.m4 - -# Update modules from gnulib, for maintainers, who should have it in -# $(gnulib_srcdir) (relative to $(srcdir) and should have build tools -# as per $(gnulib_srcdir)/DEPENDENCIES. -GNULIB_MODULES = \ - alloca-opt \ - careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr \ - dup2 \ - filemode getloadavg getopt-gnu ignore-value intprops lstat \ - manywarnings mktime pthread_sigmask readlink \ - socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat \ - warnings -GNULIB_TOOL_FLAGS = \ - --avoid=msvc-inval --avoid=msvc-nothrow \ - --avoid=raise --avoid=threadlib \ - --conditional-dependencies --import --no-changelog --no-vc-files \ - --makefile-name=gnulib.mk -sync-from-gnulib: $(gnulib_srcdir) - -cd $(srcdir)/m4 && cp $(DOS_gnulib_comp.m4) gnulib-comp.m4 - cd $(srcdir) && \ - $(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES) - cd $(srcdir)/m4 && rm gnulib-cache.m4 warn-on-use.m4 - cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS_gnulib_comp.m4) - cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc - cp \ - $(gnulib_srcdir)/build-aux/move-if-change \ - $(srcdir)/build-aux - cd $(srcdir) && autoreconf -i -I m4 -.PHONY: sync-from-gnulib +# We need to build `emacs' in `src' to compile the *.elc files in `lisp' +# and `leim'. +lisp leim: src # These targets should be "${SUBDIR} without `src'". -lib lib-src lisp: Makefile FRC - cd $@; $(MAKE) all $(MFLAGS) \ +lib lib-src lisp leim: Makefile FRC + cd $@ && $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' @@ -384,13 +344,18 @@ src: Makefile FRC VCSWITNESS="$$vcswitness" blessmail: Makefile src FRC - cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \ + cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \ MAKE='${MAKE}' archlibdir='$(archlibdir)' # We used to have one rule per */Makefile.in, but that leads to race # conditions with parallel makes, so let's assume that the time stamp on # ./Makefile is representative of the time stamp on all the other Makefiles. -Makefile: config.status $(srcdir)/src/config.in \ +# +# config.status overrides MAKEFILE_NAME with a bogus name when creating +# src/epaths.h, so that 'make epaths-force' does not recursively invoke +# config.status and overwrite config.status while executing it (Bug#11214). +MAKEFILE_NAME = Makefile +$(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \ $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) ./config.status @@ -404,16 +369,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el ./configure $(CONFIGURE_FLAGS); \ fi -AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4 +AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && autoconf -ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS_gnulib_comp.m4) +ACLOCAL_INPUTS = $(srcdir)/m4/gnulib-comp.m4 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) cd $(srcdir) && aclocal -I m4 -AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am $(srcdir)/lib/gnulib.mk +AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \ + $(srcdir)/lib/gnulib.mk $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS) cd $(srcdir) && automake --gnu -a -c lib/Makefile am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in @@ -432,56 +398,60 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) # ==================== Installation ==================== +.PHONY: install install-arch-dep install-arch-indep install-doc install-info +.PHONY: install-man install-etc install-strip uninstall + ## If we let lib-src do its own installation, that means we ## don't have to duplicate the list of utilities to install in ## this Makefile as well. -## On AIX, use tar xBf. -## On Xenix, use tar xpf. - -.PHONY: install mkdir - -## We delete each directory in ${COPYDESTS} before we copy into it; -## that way, we can reinstall over directories that have been put in -## place with their files read-only (perhaps because they are checked -## into RCS). In order to make this safe, we make sure that the -## source exists and is distinct from the destination. -### We do install-arch-indep first because -### the executable needs the Lisp files and DOC file to work properly. -install: all install-arch-indep install-arch-dep install-leim blessmail +install: all install-arch-indep install-doc install-arch-dep blessmail @true +## Ensure that $subdir contains a subdirs.el file. +## Here and elsewhere, we set the umask so that any created files are +## world-readable. +## TODO it might be good to warn about non-standard permissions of +## pre-existing directories, but that does not seem easy. +write_subdir=if [ -f $${subdir}/subdirs.el ]; \ + then true; \ + else \ + umask 022; \ + ${MKDIR_P} $${subdir}; \ + (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ + echo " (normal-top-level-add-subdirs-to-load-path))") \ + > $${subdir}/subdirs.el; \ + fi + ### Install the executables that were compiled specifically for this machine. -### It would be nice to do something for a parallel make -### to ensure that install-arch-indep finishes before this starts. -### (TODO Why would it be nice? Why not just make this depend on -### install-arch-indep then?) -install-arch-dep: mkdir - (cd lib-src; \ +### We do install-arch-indep first because the executable needs the +### Lisp files and DOC file to work properly. +install-arch-dep: install-arch-indep install-doc + umask 022; ${MKDIR_P} $(DESTDIR)${bindir} + cd lib-src && \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \ - INSTALL_STRIP=${INSTALL_STRIP}) - ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) - -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) - rm -f $(DESTDIR)${bindir}/$(EMACS) - -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) - if test "${ns_appresdir}" != ""; then \ - ( cd ${ns_appresdir} ; \ - if test -d share/emacs ; then \ - for dir in share/emacs/${version}/*; do \ - rm -fr `basename "$$dir"`; mv "$$dir" . ; done; fi ; \ - if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \ - rm -fr share ) ; \ - ( if cd ${ns_appbindir}/libexec ; then \ - mv -f emacs/${version}/${configuration}/* . ; rm -fr emacs ; \ - rm -f ../bin/emacs ../bin/$(EMACSFULL) ; \ - fi ) ; \ - else true ; fi - -## FIXME NS self-contained: rather than installing emacs and -## EMACSFULL, then deleting them, obviously it would be better to not -## install them in the first place. + INSTALL_STRIP=${INSTALL_STRIP} + if test "${ns_self_contained}" = "no"; then \ + ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ + chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \ + rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ + ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \ + else \ + subdir=${ns_appresdir}/site-lisp; \ + ${write_subdir} || exit 1; \ + rm -rf ${ns_appresdir}/share; \ + fi + +## In the share directory, we are deleting: +## applications (with emacs.desktop, also found in etc/) +## emacs (basically empty except for unneeded site-lisp directories) +## icons (duplicates etc/images/icons/hicolor) + +## This is install-etc for everything except self-contained-ns builds. +## For them, it is empty. +INSTALL_ARCH_INDEP_EXTRA = @INSTALL_ARCH_INDEP_EXTRA@ ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html ## Needs to be the user running install, so configure can't set it. @@ -491,87 +461,113 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ done ### 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. -## Ultrix is no longer supported since 23.1, but the relevant line -## has another effect. We copy the entire etc/ directory from the -## source tree first. For an in-tree build, this will include -## any DOC* files there may be. So rm DOC does have an effect. -## FIXME When we copy etc we should exclude DOC*, then copy only -## the relevant one. We cannot delete DOC* from the destination directory, -## because that may include pre-existing files from another emacs. +### Most of them come straight from the distribution; the exception is +### the DOC file, which is copied from the build directory. -## We install only the relevant DOC file if possible -## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. -## (Note "otherwise" is inaccurate since 2009-08-23.) +## We delete each directory in ${COPYDESTS} before we copy into it; +## that way, we can reinstall over directories that have been put in +## place with their files read-only (perhaps because they are checked +## into RCS). In order to make this safe, we make sure that the +## source exists and is distinct from the destination. -## If people complain about the h flag in tar command, take that out. -## That flag is also used in leim/Makefile.in +## 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. ## Note that the Makefiles in the etc directory are potentially useful ## in an installed Emacs, so should not be excluded. -install-arch-indep: mkdir info install-etc - -set ${COPYDESTS} ; \ - unset CDPATH; \ - for dir in ${COPYDIR} ; do \ - if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ - rm -rf $$1 ; \ - fi ; \ - shift ; \ +## 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. + +## Note that we use tar instead of plain old cp -R/-r because the latter +## is apparently not portable (even in 2012!). +## http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00278.html +## I have no idea which platforms Emacs supports where cp -R does not +## work correctly, and therefore no idea when tar can be replaced. +## 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: 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} ; \ - mkdir ${COPYDESTS} ; \ - chmod ugo+rx ${COPYDESTS} ; \ unset CDPATH; \ $(set_installuser); \ for dir in ${COPYDIR} ; do \ + [ -d $${dir} ] || exit 1 ; \ dest=$$1 ; shift ; \ - [ -d $${dir} ] \ - && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \ - && (echo "Copying $${dir} to $${dest}..." ; \ - (cd $${dir}; tar -chf - . ) \ - | (cd $${dest}; umask 022; \ - tar -xvf - && cat > /dev/null) || exit 1; \ - find $${dest} -exec chown $${installuser} {} ';' ;\ - for subdir in `find $${dest} -type d -print` ; do \ - chmod a+rx $${subdir} ; \ - rm -f $${subdir}/.gitignore ; \ - rm -f $${subdir}/.arch-inventory ; \ - rm -f $${subdir}/.DS_Store ; \ - rm -f $${subdir}/\#* ; \ - rm -f $${subdir}/.\#* ; \ - rm -f $${subdir}/*~ ; \ - rm -f $${subdir}/*.orig ; \ - [ "$${dir}" != "${srcdir}/etc" ] && \ - rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \ - rm -f $${subdir}/ChangeLog* ; \ - done) ; \ + [ -d $${dest} ] && \ + [ `cd $${dest} && /bin/pwd` = `cd $${dir} && /bin/pwd` ] && \ + continue ; \ + if [ "$${dir}" = "leim/quail" ]; then \ + [ `cd $${dir} && /bin/pwd` = `cd ${srcdir}/leim/quail && /bin/pwd` ] && \ + continue ; \ + else \ + rm -rf $${dest} ; \ + umask 022; ${MKDIR_P} $${dest} ; \ + fi ; \ + echo "Copying $${dir} to $${dest}..." ; \ + (cd $${dir}; tar -chf - . ) \ + | (cd $${dest}; umask 022; \ + tar -xvf - && cat > /dev/null) || exit 1; \ + [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ + for subdir in `find $${dest} -type d -print` ; do \ + rm -f $${subdir}/.gitignore ; \ + rm -f $${subdir}/.arch-inventory ; \ + rm -f $${subdir}/.DS_Store ; \ + rm -f $${subdir}/\#* ; \ + rm -f $${subdir}/.\#* ; \ + rm -f $${subdir}/*~ ; \ + rm -f $${subdir}/*.orig ; \ + rm -f $${subdir}/ChangeLog* ; \ + [ "$${dir}" != "${srcdir}/etc" ] && \ + rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \ + done ; \ + find $${dest} -exec chown $${installuser} {} ';' ;\ done + -rm -f $(DESTDIR)${leimdir}/leim-list.el + ${INSTALL_DATA} leim/leim-list.el $(DESTDIR)${leimdir}/leim-list.el -rm -f $(DESTDIR)${lispdir}/subdirs.el - $(srcdir)/update-subdirs $(DESTDIR)${lispdir} - if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \ - then true; \ - else \ - (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - echo " (normal-top-level-add-subdirs-to-load-path))") \ - > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \ - fi - chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el - -if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \ - then true; \ - else \ - (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - echo " (normal-top-level-add-subdirs-to-load-path))") \ - > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \ - fi - -chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el + umask 022; $(srcdir)/build-aux/update-subdirs $(DESTDIR)${lispdir} + subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \ + ${write_subdir} + subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \ + ${write_subdir} || true + [ -z "${GZIP_PROG}" ] || \ + ( echo "Compressing *.el ..." ; \ + unset CDPATH; \ + thisdir=`/bin/pwd`; \ + for dir in $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}; do \ + cd $${thisdir} ; \ + cd $${dir} || exit 1 ; \ + for f in `find . -name "*.elc" -print`; do \ + ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ + done ; \ + done ) + -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} + +# The last chmod isn't needed at present. + +## 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: install-arch-indep -unset CDPATH; \ - if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \ + umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \ + if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \ then \ fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \ if [ -f "./etc/DOC-$${fullversion}" ]; \ @@ -582,30 +578,19 @@ install-arch-indep: mkdir info install-etc fi; \ echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \ ${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \ - (cd $(DESTDIR)$(docdir); \ - $(set_installuser); \ - chown $${installuser} DOC*; \ - if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \ - else true; fi - -unset CDPATH; \ - if [ -n "${GZIP_PROG}" ]; \ - then \ - echo "Compressing *.el ..." ; \ - (cd $(DESTDIR)${lispdir}; for f in `find . -name "*.elc" -print`; do \ - ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ - done) \ + $(set_installuser); \ + chown $${installuser} $(DESTDIR)${docdir}/$${docfile} || true ; \ else true; fi + +install-info: info + umask 022; ${MKDIR_P} $(DESTDIR)${infodir} -unset CDPATH; \ thisdir=`/bin/pwd`; \ - if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ - then \ + [ `cd ${srcdir}/info && /bin/pwd` = `cd $(DESTDIR)${infodir} && /bin/pwd` ] || \ (cd $(DESTDIR)${infodir}; \ - if [ -f dir ]; then true; \ - else \ + [ -f dir ] || \ (cd $${thisdir}; \ - ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \ - chmod a+r $(DESTDIR)${infodir}/dir); \ - fi; \ + ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \ info_misc=`cd $${thisdir}/doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \ cd ${srcdir}/info ; \ for elt in ${INFO_NONMISC} $${info_misc}; do \ @@ -613,87 +598,62 @@ install-arch-indep: mkdir info install-etc for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ (cd $${thisdir}; \ ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \ - chmod a+r $(DESTDIR)${infodir}/$$f; \ - if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ - rm -f $(DESTDIR)${infodir}/$$f.gz; \ - ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \ - else true; fi; \ + ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ + rm -f $(DESTDIR)${infodir}/$$f.gz; \ + ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \ done; \ (cd $${thisdir}; \ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ - done); \ - else true; fi - -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} + done) + +install-man: + umask 022; ${MKDIR_P} $(DESTDIR)${man1dir} thisdir=`/bin/pwd`; \ cd ${mansrcdir}; \ for page in *.1; do \ (cd $${thisdir}; \ - ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}; \ - chmod a+r $(DESTDIR)${man1dir}/$${page}; \ - if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ - rm -f $(DESTDIR)${man1dir}/$${page}.gz; \ - ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \ - else true; fi ); \ + ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}); \ + ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ + rm -f $(DESTDIR)${man1dir}/$${page}.gz; \ + ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \ done ## Install those items from etc/ that need to end up elsewhere. -install-etc: mkdir +install-etc: + umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir} ${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \ $(DESTDIR)${desktopdir}/emacs.desktop - for icon in $(iconsrcdir)/*/*/apps/*.* \ - $(iconsrcdir)/*/*/mimetypes/*.*; do \ - if [ -r $${icon} ]; then \ - iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \ - ${INSTALL_DATA} $${icon} $${iicon} ; \ - fi ; \ + thisdir=`/bin/pwd`; \ + cd ${iconsrcdir} || exit 1; umask 022 ; \ + for dir in */*/apps */*/mimetypes; do \ + [ -d $${dir} ] || continue ; \ + ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \ + for icon in $${dir}/*.*; do \ + [ -r $${icon} ] || continue ; \ + ( cd $${thisdir}; \ + ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \ + || exit 1; \ + done ; \ done -### Install LEIM files. Although they are machine-independent, we -### have separate target here instead of including it in -### `install-arch-indep'. People who extracted LEIM files after they -### installed Emacs itself can install only LEIM files by this target. -install-leim: leim/Makefile mkdir - cd leim && $(MAKE) $(MFLAGS) install - ### Build Emacs and install it, stripping binaries while installing them. install-strip: $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install -### Build all the directories we're going to install Emacs in. -### We set the umask so that any created directories are world-readable. -### FIXME it would be good to warn about non-standard permissions of -### pre-existing directories, but that does not seem easy. -mkdir: FRC - icondirs= ; \ - for dir in $(iconsrcdir)/*/*/apps $(iconsrcdir)/*/*/mimetypes; do \ - if [ -d $${dir} ]; then \ - icondirs="$${icondirs} $${dir}" ; \ - fi ; \ - done ; \ - icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \ - umask 022 ; \ - $(MKDIR_P) $(DESTDIR)${datadir} ${COPYDESTS} \ - $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \ - $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \ - $(DESTDIR)${datadir}/emacs/site-lisp \ - $(DESTDIR)${datadir}/emacs/${version}/site-lisp \ - $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \ - $(DESTDIR)${desktopdir} $${icondirs} - ### Delete all the installed files that the `install' target would ### 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: - (cd lib-src; \ + cd lib-src && \ $(MAKE) $(MFLAGS) uninstall \ prefix=${prefix} exec_prefix=${exec_prefix} \ - bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}) + bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir} -unset CDPATH; \ for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \ if [ -d $${dir} ]; then \ - case `(cd $${dir} ; /bin/pwd)` in \ - `(cd ${srcdir} ; /bin/pwd)`* ) ;; \ + case `cd $${dir} ; /bin/pwd` in \ + `cd ${srcdir} ; /bin/pwd`* ) ;; \ * ) rm -rf $${dir} ;; \ esac ; \ case $${dir} in \ @@ -730,7 +690,7 @@ FRC: # ==================== Cleaning up and miscellanea ==================== -.PHONY: mostlyclean clean distclean maintainer-clean extraclean +.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean ### `mostlyclean' ### Like `clean', but may refrain from deleting a few files that people @@ -840,13 +800,14 @@ maintainer-clean: bootstrap-clean FRC ### the coding standards seem to come from. It's like distclean, but ### it deletes backup and autosave files too. extraclean: - for i in ${SUBDIR} leim; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done + for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done ${top_maintainer_clean} -rm -f config-tmp-* -rm -f *~ \#* # The src subdir knows how to do the right thing # even when the build directory and source dir are different. +.PHONY: TAGS tags TAGS tags: lib lib-src src cd src; $(MAKE) $(MFLAGS) tags @@ -861,7 +822,7 @@ check: dist: cd ${srcdir}; ./make-dist -.PHONY: info dvi dist check html +.PHONY: info dvi dist check html info-real force-info check-info-dir info-real: (cd doc/emacs; $(MAKE) $(MFLAGS) info)