From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63B511382C5 for ; Thu, 25 Feb 2021 17:39:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92455E09B4; Thu, 25 Feb 2021 17:39:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 753EAE09B4 for ; Thu, 25 Feb 2021 17:39:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86C93340FB0 for ; Thu, 25 Feb 2021 17:39:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24D99478 for ; Thu, 25 Feb 2021 17:39:39 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1614274411.778477df4be714c3dc02e04cb7e116b15167e83e.ulm@gentoo> Subject: [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: / X-VCS-Repository: proj/emacs-tools X-VCS-Files: ChangeLog Makefile subdirs.el subdirs.el.in X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 778477df4be714c3dc02e04cb7e116b15167e83e X-VCS-Branch: emacs-common-gentoo Date: Thu, 25 Feb 2021 17:39:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4c875ec0-62d4-4067-ac50-78ac50002d0d X-Archives-Hash: a53716b744b990a0b693edd09079d18a commit: 778477df4be714c3dc02e04cb7e116b15167e83e Author: Ulrich Müller gentoo org> AuthorDate: Thu Feb 25 17:33:31 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Feb 25 17:33:31 2021 +0000 URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=778477df Add subdirectories of the modules directory to load-path * subdirs.el.in: Renamed from subdirs.el. Check for subdirectories of the modules directory too. * Makefile (DISTFILES): Update. Signed-off-by: Ulrich Müller gentoo.org> ChangeLog | 6 ++++++ Makefile | 4 ++-- subdirs.el | 3 --- subdirs.el.in | 8 ++++++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0cbd4a..55f4563 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-02-25 Ulrich Müller + + * subdirs.el.in: Renamed from subdirs.el. Check for subdirectories + of the modules directory too. + * Makefile (DISTFILES): Update. + 2017-02-04 Ulrich Müller * Version 1.6 released. diff --git a/Makefile b/Makefile index 6fb696a..7c5bc2e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2007-2017 Gentoo Authors +# Copyright 2007-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 or later PN = emacs-common-gentoo @@ -13,7 +13,7 @@ ICONFILES = sink.png \ emacs23_128.png emacs23.svg \ emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \ emacs25_128.png emacs25.svg -DISTFILES = site-start.el site-gentoo.el subdirs.el $(DESKTOPFILES) \ +DISTFILES = site-start.el site-gentoo.el subdirs.el.in $(DESKTOPFILES) \ $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) diff --git a/subdirs.el b/subdirs.el deleted file mode 100644 index ee1c123..0000000 --- a/subdirs.el +++ /dev/null @@ -1,3 +0,0 @@ -;; -*- no-byte-compile: t -*- -(if (fboundp 'normal-top-level-add-subdirs-to-load-path) - (normal-top-level-add-subdirs-to-load-path)) diff --git a/subdirs.el.in b/subdirs.el.in new file mode 100644 index 0000000..3432bf0 --- /dev/null +++ b/subdirs.el.in @@ -0,0 +1,8 @@ +;; -*- no-byte-compile: t -*- +(when (fboundp 'normal-top-level-add-subdirs-to-load-path) + (normal-top-level-add-subdirs-to-load-path) + ;; We install dynamic modules in a more FHS compliant location, + ;; so add its subdirectories to the load-path, too + (let ((default-directory "/usr/@libdir@/emacs/modules/")) + (if (file-directory-p default-directory) + (normal-top-level-add-subdirs-to-load-path))))