From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yavor Doganov Newsgroups: gmane.emacs.bugs Subject: bug#1335: #1335 - Arch-dependant data should not be installed in the app bundle - Emacs bug report logs Date: Fri, 26 Jun 2009 16:41:50 +0300 Organization: The GNU Emacs Church (Bulgarian eparchy) Message-ID: <87zlbvnmch.GNU's_Not_Unix!%yavor@gnu.org> References: <5ED0CA60-A3EF-4C7A-81C1-AF9D9EF0DACF@gmail.com> Reply-To: Yavor Doganov , 1335@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1246024666 30750 80.91.229.12 (26 Jun 2009 13:57:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 26 Jun 2009 13:57:46 +0000 (UTC) Cc: Yavor Doganov To: Adrian Robert , 1335@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jun 26 15:57:39 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MKBvu-0002c0-7x for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Jun 2009 15:57:38 +0200 Original-Received: from localhost ([127.0.0.1]:57385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MKBvt-000720-Ma for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Jun 2009 09:57:37 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MKBvo-0006zP-2f for bug-gnu-emacs@gnu.org; Fri, 26 Jun 2009 09:57:32 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MKBvj-0006xP-0X for bug-gnu-emacs@gnu.org; Fri, 26 Jun 2009 09:57:31 -0400 Original-Received: from [199.232.76.173] (port=60800 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MKBvi-0006xD-Rh for bug-gnu-emacs@gnu.org; Fri, 26 Jun 2009 09:57:26 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:38684) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MKBvh-0006US-V4 for bug-gnu-emacs@gnu.org; Fri, 26 Jun 2009 09:57:26 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n5QDvMFD021404; Fri, 26 Jun 2009 06:57:24 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n5QDo42C019935; Fri, 26 Jun 2009 06:50:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Yavor Doganov Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs , owner@emacsbugs.donarmstrong.com Resent-Date: Fri, 26 Jun 2009 13:50:04 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 1335 X-Emacs-PR-Package: emacs,ns X-Emacs-PR-Keywords: Original-Received: via spool by 1335-submit@emacsbugs.donarmstrong.com id=B1335.124602378418947 (code B ref 1335); Fri, 26 Jun 2009 13:50:04 +0000 Original-Received: (at 1335) by emacsbugs.donarmstrong.com; 26 Jun 2009 13:43:04 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from southway-varna.com ([213.91.219.2]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n5QDg3wI018913; Fri, 26 Jun 2009 06:42:05 -0700 Original-Received: from keel.southway-varna.com ([192.168.0.2]) by southway-varna.com with esmtp (Exim 4.69) (envelope-from ) id 1MKBge-0006Ak-DG; Fri, 26 Jun 2009 16:41:55 +0300 Original-Received: from localhost ([127.0.0.1] helo=keel.southway-varna.com) by keel.southway-varna.com with esmtp (Exim 4.69) (envelope-from ) id 1MKBgc-0003Av-5I; Fri, 26 Jun 2009 16:41:50 +0300 In-Reply-To: <5ED0CA60-A3EF-4C7A-81C1-AF9D9EF0DACF@gmail.com> Mail-Followup-To: Adrian Robert , 1335@emacsbugs.donarmstrong.com, Yavor Doganov User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 =?UTF-8?Q?(Goj=C5=8D)?= APEL/10.7 Emacs/22.3 (i486-pc-linux-gnu) MULE/5.0 (SAKAKI) X-Jabber-ID: doganov@jabber.minus273.org X-SA-Exim-Connect-IP: 192.168.0.2 X-SA-Exim-Mail-From: yavor@gnu.org X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:14:11 +0000) X-SA-Exim-Scanned: Yes (on southway-varna.com) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 26 Jun 2009 09:57:31 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:28988 Archived-At: tags 1335 + patch thanks At Mon, 24 Nov 2008 22:29:20 -0500, Adrian Robert wrote: > Does this patch not cause an error for you when lines 416-417 in > Makefile.in (under install-arch-dep target) are executed? Eek! Not merely an error, the entire working copy is being deleted... I haven't noticed this because I run "make install" when the tree is configured with --without-x so these commands are not being run at all as `ns_appdir' is undefined. Here's an updated patch, hopefully properly tested this time. 2009-06-26 Yavor Doganov Do not install arch-dependent files in the app bundle if --disable-ns-self-contained is requested. * configure.in: Define `exec_prefix' and `libexecdir' relative to `ns_appbindir' only if configured for a self-contained app. * Makefile.in (install-arch-dep): Test for the existence of libexec in the Emacs.app bundle before executing commands. Index: Makefile.in =================================================================== RCS file: /sources/emacs/emacs/Makefile.in,v retrieving revision 1.374 diff -u -r1.374 Makefile.in --- Makefile.in 4 May 2009 01:13:20 -0000 1.374 +++ Makefile.in 26 Jun 2009 13:34:48 -0000 @@ -429,10 +429,10 @@ if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ rm -fr share ) ; \ - ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ - rm -fr emacs ) ; \ - ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \ - ln -sf ../libexec/* .) ; \ + ( cd ${ns_appbindir} ; \ + if test -d libexec; then cd libexec ; dir=emacs/*/*/* ; \ + $(MV_DIRS); rm -fr emacs; \ + cd ../bin; rm -f emacs emacs-23* ; ln -sf ../libexec/* . ; fi) ; \ else true ; fi ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html --- configure.in 19 Jun 2009 17:10:51 -0000 1.598 +++ configure.in 26 Jun 2009 13:35:00 -0000 @@ -1270,10 +1270,10 @@ window_system=nextstep with_xft=no # set up packaging dirs - exec_prefix=${ns_appbindir} - libexecdir=${ns_appbindir}/libexec if test "${EN_NS_SELF_CONTAINED}" = yes; then prefix=${ns_appresdir} + exec_prefix=${ns_appbindir} + libexecdir=${ns_appbindir}/libexec fi fi CFLAGS="$tmp_CFLAGS"