comparison Makefile.in @ 1899:fb1b9a269763

* Makefile.in (${SUBDIR}): Pass CONFIG_CFLAGS to the submakes, not CFLAGS. * Makefile.in (locallisppath): Make this default to ${datadir}/emacs/site-lisp, instead of ${datadir}/emacs/local-lisp. ${datadir} and ${statedir} are often the same thing, and local-lisp causes completion conflicts with lock. (lisppath): Add ${externallispdir} to this. * INSTALL: Adjust installation directions. * Makefile.in (externallispdir): New variable, to say where to install the externally-maintained lisp files. (COPYDIR, COPYDESTS): Copy the external lisp directory just like the others. * INSTALL: Describe external-lisp and the new externallispdir variable.

1898:3aeb6e0c5bba

# Where to install the elisp 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=${datadir}/emacs/${version}/lisp

# Directories Emacs should search for elisp files specific to this
# site (i.e. customizations), before consulting ${lispdir}.  This
# should be a colon-separated list of directories.
locallisppath=${datadir}/emacs/local-lisp

# Where Emacs will search to find its elisp 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.
lisppath=${locallisppath}:${lispdir}

# Where Emacs will search for its elisp files while building.  This is
# only used during the process of compiling Emacs, to help Emacs find
# its lisp files before they've been installed in their final
# location.  It's usually identical to lisppath, except that the entry

# Subdirectories to install, and where they'll go.
# lib-src's makefile 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 = etc ${srcdir}/lisp
COPYDESTS = ${etcdir} ${lispdir}

all:	src/paths.h ${SUBDIR}

removenullpaths=sed -e 's/^://' -e 's/:$$//' -e 's/::/:/'

.RECURSIVE: ${SUBDIR}

${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
	cd $@; $(MAKE) all ${MFLAGS} \
		CC='${CC}' CFLAGS='${CFLAGS}' \
		srcdir='${srcdir}/$@' libdir='${libdir}'

## We build the makefiles for the subdirectories here so that we can
## edit the values for the path variables into them.  This means that
## when the user has built them from this makefile once, they will use

1899:fb1b9a269763

# Where to install the elisp 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=${datadir}/emacs/${version}/lisp

# Where to install the elisp files which are distributed with Emacs
# but not maintained by the FSF.  This includes the Emacs version, so
# that the lisp files for different versions of Emacs will install
# themselves in separate directories.
externallispdir=${datadir}/emacs/${version}/external-lisp

# Directories Emacs should search for elisp files specific to this
# site (i.e. customizations), before consulting ${lispdir}.  This
# should be a colon-separated list of directories.
locallisppath=${datadir}/emacs/site-lisp

# Where Emacs will search to find its elisp 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.
lisppath=${locallisppath}:${lispdir}:${externallispdir}

# Where Emacs will search for its elisp files while building.  This is
# only used during the process of compiling Emacs, to help Emacs find
# its lisp files before they've been installed in their final
# location.  It's usually identical to lisppath, except that the entry

# Subdirectories to install, and where they'll go.
# lib-src's makefile 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 = etc ${srcdir}/lisp ${srcdir}/external-lisp
COPYDESTS = ${etcdir} ${lispdir} ${externallispdir}

all:	src/paths.h ${SUBDIR}

removenullpaths=sed -e 's/^://' -e 's/:$$//' -e 's/::/:/'

.RECURSIVE: ${SUBDIR}

${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
	cd $@; $(MAKE) all ${MFLAGS} \
		CC='${CC}' CONFIG_CFLAGS='${CONFIG_CFLAGS}' \
		srcdir='${srcdir}/$@' libdir='${libdir}'

## We build the makefiles for the subdirectories here so that we can
## edit the values for the path variables into them.  This means that
## when the user has built them from this makefile once, they will use