[PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[Amadeusz Żołnowski]

--emacsetcdir was added, but it's set default to the same value as
--emacslispdir for backward compatibility.
---
 configure            |   14 ++++++++++++++
 emacs/Makefile.local |    3 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 3999ce8..37c0283 100755
--- a/configure
+++ b/configure
@@ -97,6 +97,7 @@ Fine tuning of some installation directories is available:
 	--mandir=DIR		Install man pages to DIR [PREFIX/share/man]
 	--sysconfdir=DIR	Read-only single-machine data [PREFIX/etc]
 	--emacslispdir=DIR	Emacs code [PREFIX/share/emacs/site-lisp]
+	--emacsetcdir=DIR	Emacs miscellaneous files [PREFIX/share/emacs/site-lisp]
 	--bashcompletiondir=DIR Bash completions files [SYSCONFDIR/bash_completion.d]
 	--zshcompletiondir=DIR	Zsh completions files [PREFIX/share/zsh/functions/Completion/Unix]
 
@@ -139,6 +140,8 @@ for option; do
 	SYSCONFDIR="${option#*=}"
     elif [ "${option%%=*}" = '--emacslispdir' ] ; then
 	EMACSLISPDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--emacsetcdir' ] ; then
+	EMACSETCDIR="${option#*=}"
     elif [ "${option%%=*}" = '--bashcompletiondir' ] ; then
 	BASHCOMPLETIONDIR="${option#*=}"
     elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
@@ -330,6 +333,14 @@ if [ -z "${EMACSLISPDIR}" ]; then
     fi
 fi
 
+if [ -z "${EMACSETCDIR}" ]; then
+    if pkg-config --exists emacs; then
+	EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir)
+    else
+	EMACSETCDIR='$(prefix)/share/emacs/site-lisp'
+    fi
+fi
+
 printf "Checking if emacs is available... "
 if emacs --quick --batch > /dev/null 2>&1; then
     printf "Yes.\n"
@@ -614,6 +625,9 @@ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
 # The directory to which emacs lisp files should be installed
 emacslispdir=${EMACSLISPDIR}
 
+# The directory to which emacs lisp files should be installed
+emacsetcdir=${EMACSETCDIR}
+
 # Whether there's an emacs binary available for byte-compiling
 HAVE_EMACS = ${have_emacs}
 
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index ce0c3f0..0c58b82 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -38,6 +38,7 @@ install-emacs:
 ifeq ($(HAVE_EMACS),1)
 	install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)"
 endif
-	install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)"
+	mkdir -p "$(DESTDIR)$(emacsetcdir)"
+	install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)
-- 
1.7.7.1

Re: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[David Bremner]

On Mon, 24 Oct 2011 20:34:58 +0200, Amadeusz Żołnowski <aidecoe@aidecoe.name> wrote:
> --emacsetcdir was added, but it's set default to the same value as
> --emacslispdir for backward compatibility.
> ---

At a quick search, I couldn't find any reference to --emacsetcdir
outside Gentoo. I'd like to hear what other people think about this one.

Thanks,

David

Re: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[Thomas Jost]

[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]

On Mon, 24 Oct 2011 22:13:11 -0300, David Bremner <david@tethera.net> wrote:
> On Mon, 24 Oct 2011 20:34:58 +0200, Amadeusz Żołnowski <aidecoe@aidecoe.name> wrote:
> > --emacsetcdir was added, but it's set default to the same value as
> > --emacslispdir for backward compatibility.
> > ---
> 
> At a quick search, I couldn't find any reference to --emacsetcdir
> outside Gentoo. I'd like to hear what other people think about this one.

I had never heard of that, but apparently there's a
/usr/share/emacs/24.0.90/etc on my system which contains images, READMEs
and other misc files. It's also described in the "data-directory"
variable in Emacs:

    data-directory is a variable defined in `C source code'.
    Its value is "/usr/share/emacs/24.0.90/etc/"

    Documentation:
    Directory of machine-independent files that come with GNU Emacs.
    These are files intended for Emacs to use while it runs.

So I guess it can't hurt to add this.

However there is something annoying in the commit:

+# The directory to which emacs lisp files should be installed
+emacsetcdir=${EMACSETCDIR}

$EMACSETCDIR is not for emacs lisp files (that's what $EMACSLISPDIR is
for), so this line needs be fixed.

Regards

-- 
Thomas/Schnouki

[-- Attachment #2: Type: application/pgp-signature, Size: 489 bytes --]

[PATCH] Separate Emacs misc. files dir. from Emacs code dir.

[Amadeusz Żołnowski]

New option --emacsetcdir was added, but it's set default to the same
value as --emacslispdir for backward compatibility.
---
 configure            |   15 +++++++++++++++
 emacs/Makefile.local |    3 ++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 3999ce8..e90b76f 100755
--- a/configure
+++ b/configure
@@ -97,6 +97,7 @@ Fine tuning of some installation directories is available:
 	--mandir=DIR		Install man pages to DIR [PREFIX/share/man]
 	--sysconfdir=DIR	Read-only single-machine data [PREFIX/etc]
 	--emacslispdir=DIR	Emacs code [PREFIX/share/emacs/site-lisp]
+	--emacsetcdir=DIR	Emacs miscellaneous files [PREFIX/share/emacs/site-lisp]
 	--bashcompletiondir=DIR Bash completions files [SYSCONFDIR/bash_completion.d]
 	--zshcompletiondir=DIR	Zsh completions files [PREFIX/share/zsh/functions/Completion/Unix]
 
@@ -139,6 +140,8 @@ for option; do
 	SYSCONFDIR="${option#*=}"
     elif [ "${option%%=*}" = '--emacslispdir' ] ; then
 	EMACSLISPDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--emacsetcdir' ] ; then
+	EMACSETCDIR="${option#*=}"
     elif [ "${option%%=*}" = '--bashcompletiondir' ] ; then
 	BASHCOMPLETIONDIR="${option#*=}"
     elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
@@ -330,6 +333,14 @@ if [ -z "${EMACSLISPDIR}" ]; then
     fi
 fi
 
+if [ -z "${EMACSETCDIR}" ]; then
+    if pkg-config --exists emacs; then
+	EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir)
+    else
+	EMACSETCDIR='$(prefix)/share/emacs/site-lisp'
+    fi
+fi
+
 printf "Checking if emacs is available... "
 if emacs --quick --batch > /dev/null 2>&1; then
     printf "Yes.\n"
@@ -614,6 +625,10 @@ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
 # The directory to which emacs lisp files should be installed
 emacslispdir=${EMACSLISPDIR}
 
+# The directory to which emacs miscellaneous (machine-independent) files should
+# be installed
+emacsetcdir=${EMACSETCDIR}
+
 # Whether there's an emacs binary available for byte-compiling
 HAVE_EMACS = ${have_emacs}
 
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index ce0c3f0..0c58b82 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -38,6 +38,7 @@ install-emacs:
 ifeq ($(HAVE_EMACS),1)
 	install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)"
 endif
-	install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)"
+	mkdir -p "$(DESTDIR)$(emacsetcdir)"
+	install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)
-- 
1.7.7.1

Re: [PATCH] Separate Emacs misc. files dir. from Emacs code dir.

[David Bremner]

On Tue, 25 Oct 2011 10:07:02 +0200, Amadeusz Żołnowski <aidecoe@aidecoe.name> wrote:
> New option --emacsetcdir was added, but it's set default to the same
> value as --emacslispdir for backward compatibility.
> ---
>  configure            |   15 +++++++++++++++
>  emacs/Makefile.local |    3 ++-
>  2 files changed, 17 insertions(+), 1 deletions(-)

Pushed.

d

Re: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[Amadeusz Żołnowski]

Excerpts from Thomas Jost's message of 2011-10-25 09:12:44 +0200:
> However there is something annoying in the commit:
> 
> +# The directory to which emacs lisp files should be installed
> +emacsetcdir=${EMACSETCDIR}
> 
> $EMACSETCDIR is not for emacs lisp files (that's what $EMACSLISPDIR is
> for), so this line needs be fixed.

Ups. :-)  Just fixed with patch sent moment ago.


Regards,

-- 
Amadeusz Żołnowski

Re: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[Tomi Ollila]

On Tue 25 Oct 2011 11:11, Amadeusz Żołnowski <aidecoe@aidecoe.name> writes:

> Excerpts from Thomas Jost's message of 2011-10-25 09:12:44 +0200:
>> However there is something annoying in the commit:
>> 
>> +# The directory to which emacs lisp files should be installed
>> +emacsetcdir=${EMACSETCDIR}
>> 
>> $EMACSETCDIR is not for emacs lisp files (that's what $EMACSLISPDIR is
>> for), so this line needs be fixed.
>
> Ups. :-)  Just fixed with patch sent moment ago.

And managed to write comment with line length more than 80 chars ;/

>
> Regards,
>
> -- 
> Amadeusz Żołnowski

Tomi

Re: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

Excerpts from Tomi Ollila's message of 2011-10-25 10:17:20 +0200:
> On Tue 25 Oct 2011 11:11, Amadeusz Żołnowski <aidecoe@aidecoe.name> writes:
> 
> > Excerpts from Thomas Jost's message of 2011-10-25 09:12:44 +0200:
> >> However there is something annoying in the commit:
> >> 
> >> +# The directory to which emacs lisp files should be installed
> >> +emacsetcdir=${EMACSETCDIR}
> >> 
> >> $EMACSETCDIR is not for emacs lisp files (that's what $EMACSLISPDIR is
> >> for), so this line needs be fixed.
> >
> > Ups. :-)  Just fixed with patch sent moment ago.
> 
> And managed to write comment with line length more than 80 chars ;/

Hm, where?  You mean comment below?  Line ends with printable char at
79.  80 is \n.

# The directory to which emacs miscellaneous (machine-independent) files should
# be installed

-- 
Amadeusz Żołnowski

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[Tomi Ollila]

On Tue 25 Oct 2011 11:31, Amadeusz Żołnowski <aidecoe@aidecoe.name> writes:

> Excerpts from Tomi Ollila's message of 2011-10-25 10:17:20 +0200:
>> On Tue 25 Oct 2011 11:11, Amadeusz Żołnowski <aidecoe@aidecoe.name> writes:
>> 
>> > Excerpts from Thomas Jost's message of 2011-10-25 09:12:44 +0200:
>> >> However there is something annoying in the commit:
>> >> 
>> >> +# The directory to which emacs lisp files should be installed
>> >> +emacsetcdir=${EMACSETCDIR}
>> >> 
>> >> $EMACSETCDIR is not for emacs lisp files (that's what $EMACSLISPDIR is
>> >> for), so this line needs be fixed.
>> >
>> > Ups. :-)  Just fixed with patch sent moment ago.
>> 
>> And managed to write comment with line length more than 80 chars ;/
>
> Hm, where?  You mean comment below?  Line ends with printable char at
> 79.  80 is \n.

You're right -- my bad -- I forgot to remove the leading '+' (marking added
line). The line looked so long so I narrowed my emacs window to 80 chars to
investigate but then I was sloppy there...

> Amadeusz Żołnowski

Tomi

Re: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[Tomi Ollila]

On Tue 25 Oct 2011 10:12, Thomas Jost <schnouki@schnouki.net> writes:

> On Mon, 24 Oct 2011 22:13:11 -0300, David Bremner <david@tethera.net> wrote:
>> On Mon, 24 Oct 2011 20:34:58 +0200, Amadeusz Żołnowski <aidecoe@aidecoe.name> wrote:
>> > --emacsetcdir was added, but it's set default to the same value as
>> > --emacslispdir for backward compatibility.
>> > ---
>> 
>> At a quick search, I couldn't find any reference to --emacsetcdir
>> outside Gentoo. I'd like to hear what other people think about this one.
>
> I had never heard of that, but apparently there's a
> /usr/share/emacs/24.0.90/etc on my system which contains images, READMEs
> and other misc files. It's also described in the "data-directory"
> variable in Emacs:
>
>     data-directory is a variable defined in `C source code'.
>     Its value is "/usr/share/emacs/24.0.90/etc/"
>
>     Documentation:
>     Directory of machine-independent files that come with GNU Emacs.
>     These are files intended for Emacs to use while it runs.
>
> So I guess it can't hurt to add this.

except...

emacslispdir is supposed to be PREFIX/share/emacs/site-lisp

In case emacsetcdir is not set to anything else this is to be
the same.

But what is the value for emacsetcdir used in Gentoo ?
------------------------------------------------------

The above "/usr/share/emacs/24.0.90/etc/" is analogous to 

PREFIX/share/emacs/<version>/etc; 

In PREFIX/share/emacs/<version> there is also (23.a in question):
drwxr-xr-x. 11 root root  4096 May 31 13:49 etc/
drwxr-xr-x.  4 root root  4096 May 31 13:49 leim/
drwxr-xr-x. 23 root root 12288 May 31 13:49 lisp/
drwxr-xr-x.  2 root root  4096 May 31 13:49 site-lisp/

(this site-lisp is different than the emacslispdir in question, so
the 'etc' here doesn't match emacsetcdir... but hey! maybe the answer
to the above question is: PREFIX/share/emacs/etc ? )

Anyway, I'm for inclusion of this patch, provided that there is good
explanation of it -- It doesn't seem to break things.

>
> However there is something annoying in the commit:
>
> +# The directory to which emacs lisp files should be installed
> +emacsetcdir=${EMACSETCDIR}
>
> $EMACSETCDIR is not for emacs lisp files (that's what $EMACSLISPDIR is
> for), so this line needs be fixed.

indeed.

>
> Regards
>
> -- 
> Thomas/Schnouki

Tomi

Re: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory.

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 747 bytes --]

Excerpts from Tomi Ollila's message of 2011-10-25 10:15:15 +0200:
> emacslispdir is supposed to be PREFIX/share/emacs/site-lisp
> 
> In case emacsetcdir is not set to anything else this is to be
> the same.
> 
> But what is the value for emacsetcdir used in Gentoo ?

The policy in Gentoo with Emacs is to put misc files into separate
directory which defaults to /usr/share/emacs/etc.

It's how I use these options in my ebuild:

  --emacslispdir="${ROOT}/${SITELISP}/${PN}"
  --emacsetcdir="${ROOT}/${SITEETC}/${PN}"

(${PN} is package name.)

Without this option I need to alter locations of notmuch-logo.png later,
which is ugly.  New option doesn't hurt existing usage and helps Gentoo.
:-)


-- 
Amadeusz Żołnowski

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]