From patchwork Sat Apr 17 17:06:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28610 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A192127BC77; Sat, 17 Apr 2021 18:09:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D4E427BC6C for ; Sat, 17 Apr 2021 18:09:22 +0100 (BST) Received: from localhost ([::1]:56466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoRd-00013f-FX for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:09:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQV-0008GW-OP for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQV-0000Hk-Bk for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQV-0005de-5e for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 16/33] gnu: emacs-org-contrib: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867926921372 (code B ref 47661); Sat, 17 Apr 2021 17:08:11 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:49 +0000 Received: from localhost ([127.0.0.1]:44334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ9-0005YY-8J for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:49 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:53563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPy-0005XV-3M for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:38 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzC6ZBMz1LBSW for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzC6ZBMz1LBSW DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679255; bh=xy9dv9tGHuDGvZY4An/AAfWbM7LNl0UDdKoxtS90H60=; h=From:To:Subject:Date:In-Reply-To:References:From; b=F7wR0srtsawSjeyUPigIislLRZm8aNMOsVuSz86/ZbwUXHilTh8WL+B/QvGH6mxeu JSXyY8+F43rhghufpJGaN0TRMODfqVnmV6i5YBdW1ZC3fFOKdBynav2y1rv4XLyucf EWQSDgtgwJSPa5KtuqZbIkDEDWQ9ykZWyy6R8NsM= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:31 +0200 Message-Id: <20210417170648.3810-16-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-org-contrib)[delete-org-files]: Excurse into elpa-directory. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 76b7517566..fd38b70c59 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11191,8 +11191,7 @@ programming and reproducible research.") (duplicates (lset-intersection string=? contrib-files org+contrib-files))) - (with-directory-excursion - (string-append out "/share/emacs/site-lisp") + (with-directory-excursion (elpa-directory out) (for-each delete-file duplicates)) #t)))))) (propagated-inputs