* bug#1335: Arch-dependant data should not be installed in the app bundle
@ 2008-11-12 15:12 Yavor Doganov
0 siblings, 0 replies; 2+ messages in thread
From: Yavor Doganov @ 2008-11-12 15:12 UTC (permalink / raw)
To: bug-gnu-emacs
Package: emacs,ns
I see no reason to install arch-dependent data in the app bundle when
--ns-disable-ns-self-contained is passed. This only causes trouble
for distributors (who typically build several variants -- GTK+, Lucid,
-nox and now the GNUstep port) which share the same common binaries
(in Debian shipped in the emacsXX-bin-common package).
This also doesn't make sense for mortal users who wish to install both
a GTK+ and GNUstep Emacs under the same prefix; a perfectly valid
scenario.
2008-11-12 Yavor Doganov <yavor@gnu.org> (tiny change)
* configure.in: Under NS, set `exec_prefix' and `libexecdir'
relative to `ns_appbindir' only if Emacs is configured for a
self-contained app.
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.575
diff -u -u -r1.575 configure.in
--- configure.in 7 Nov 2008 06:56:39 -0000 1.575
+++ configure.in 12 Nov 2008 14:56:06 -0000
@@ -1274,10 +1274,10 @@
with_xft=no
with_freetype=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"
^ permalink raw reply [flat|nested] 2+ messages in thread
* bug#1335: #1335 - Arch-dependant data should not be installed in the app bundle - Emacs bug report logs
@ 2008-11-25 3:29 Adrian Robert
2009-06-26 13:41 ` Yavor Doganov
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Robert @ 2008-11-25 3:29 UTC (permalink / raw)
To: 1335; +Cc: Yavor Doganov
Hi,
Does this patch not cause an error for you when lines 416-417 in
Makefile.in (under install-arch-dep target) are executed? Should ' if
test -d ' checks similer to the preceding lines be added?
thanks,
Adrian
^ permalink raw reply [flat|nested] 2+ messages in thread
* bug#1335: #1335 - Arch-dependant data should not be installed in the app bundle - Emacs bug report logs
2008-11-25 3:29 bug#1335: #1335 - Arch-dependant data should not be installed in the app bundle - Emacs bug report logs Adrian Robert
@ 2009-06-26 13:41 ` Yavor Doganov
2011-11-22 1:59 ` bug#1335: Arch-dependant data should not be installed in the app bundle Glenn Morris
0 siblings, 1 reply; 2+ messages in thread
From: Yavor Doganov @ 2009-06-26 13:41 UTC (permalink / raw)
To: Adrian Robert, 1335; +Cc: Yavor Doganov
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 <yavor@gnu.org>
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"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-22 1:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-12 15:12 bug#1335: Arch-dependant data should not be installed in the app bundle Yavor Doganov
-- strict thread matches above, loose matches on Subject: below --
2008-11-25 3:29 bug#1335: #1335 - Arch-dependant data should not be installed in the app bundle - Emacs bug report logs Adrian Robert
2009-06-26 13:41 ` Yavor Doganov
2011-11-22 1:59 ` bug#1335: Arch-dependant data should not be installed in the app bundle Glenn Morris
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.