From 18942259ce798a4c5147c10f0cbb0c6138fca08c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 5 Jun 2015 16:12:44 -0400 Subject: [PATCH] * lisp/Makefile.in (SUBDIRS): Rename from SUBDIRS_ABS. (SUBDIRS_REL): Derive from SUBDIRS. --- lisp/Makefile.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 9c3bf551b93..46de98925de 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -120,16 +120,18 @@ unexport EMACSDATA EMACSDOC EMACSPATH # Prevent any setting of EMACSLOADPATH in user environment causing problems. emacs = EMACSLOADPATH= '$(EMACS)' $(EMACSOPT) -SUBDIRS_REL = $(sort $(shell cd ${srcdir} && find . -type d -print)) -SUBDIRS_ABS = $(sort $(shell find ${srcdir} -type d -print)) +## Subdirectories, relative to builddir. +SUBDIRS = $(sort $(shell find ${srcdir} -type d -print)) +## Subdirectories, relative to srcdir. +SUBDIRS_REL = $(patsubst ${srcdir}%,.%,${SUBDIRS}) ## All subdirectories except 'obsolete' and 'term'. -SUBDIRS_ALMOST = $(filter-out ${srcdir}/obsolete ${srcdir}/term,${SUBDIRS_ABS}) +SUBDIRS_ALMOST = $(filter-out ${srcdir}/obsolete ${srcdir}/term,${SUBDIRS}) ## All subdirectories except 'obsolete', 'term', and 'leim' (and subdirs). ## We don't want the leim files listed as packages, especially ## since many share basenames with files in language/. SUBDIRS_FINDER = $(filter-out ${srcdir}/leim%,${SUBDIRS_ALMOST}) ## All subdirectories in which we might want to create subdirs.el. -SUBDIRS_SUBDIRS = $(filter-out ${srcdir}/cedet% ${srcdir}/leim%,${SUBDIRS_ABS}) +SUBDIRS_SUBDIRS = $(filter-out ${srcdir}/cedet% ${srcdir}/leim%,${SUBDIRS}) # cus-load and finder-inf are not explicitly requested by anything, so # we add them here to make sure they get built. -- 2.39.5