From: Jambunathan K <kjambunathan@gmail.com>
To: Ulrich Mueller <ulm@gentoo.org>
Cc: emacs-orgmode@gnu.org
Subject: Re: Location of OpenDocument style files should be configurable
Date: Sat, 31 Dec 2011 01:23:58 +0530 [thread overview]
Message-ID: <81k45du97t.fsf@gmail.com> (raw)
In-Reply-To: <20220.19946.360761.625682@a1i15.kph.uni-mainz.de> (Ulrich Mueller's message of "Thu, 29 Dec 2011 12:24:26 +0100")
Ulrich
I have pushed a fix so that "make install" will do the right
thing. Package maintainers have to modify just the $(lispdir) and
$(datadir) vars in the Makefile. (Hopefully) They don't have to do
anything special at all. You may also want to read the comments under
DATAFILES to have an idea of what is available for packaging.
You can download a snapshot from the current HEAD:
http://orgmode.org/w/?p=org-mode.git;a=summary
Let know how things go.
Thanks,
Jambunathan K.
Here is a summary of change:
--8<---------------cut here---------------start------------->8---
From 07f006e4fd9a7b66643cd7b404c8994665ba8300 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Sat, 31 Dec 2011 01:00:56 +0530
Subject: [PATCH 1/2] Fix packaging of ODT exporter (org-7.8.02) in Gentoo
* org-odt.el (org-odt-lib-dir): Add docstring.
(org-odt-data-dir): New variable. Use this variable to
control the locations from which the ODT exporter picks the
OpenDocument styles and schema files from. Set this variable
explicitly only if the in-built heuristics for locating the
above files fails.
(org-odt-styles-dir-list, org-odt-schema-dir-list): New
variables. Pay specific attention to (eval-when-compile ...)
form through which Makefile's $(datadir) - contained in
`org-odt-data-dir' - gets compiled in as a "hard coded"
constant.
(org-odt-styles-dir, org-export-odt-schema-dir): Add messages
to aid debugging.
* Makefile (etcdir): Remove this.
(stylesdir): Rename to datadir.
(datadir): Was stylesdir.
(STYLESFILES): Rename to DATAFILES.
(DATAFILES): Was STYLESFILES. Offer a menu of files that is
available. Package maintainers can use this list and their
own discretion to cherry-pick what they are willing to install
in their distribution.
(CP): Add recursive flag so that directories listed in
DATAFILES can be copied enbloc.
(install-lisp): Use conditional flag BATCH_EXTRA
(BATCH_EXTRA): "Target-specific variable value" that plumbs
the value of $(datadir) in to org-odt.el via
`org-odt-data-dir'. See ChangeLog entries for
`org-odt-styles-dir-list' and `org-odt-schema-dir-list'.
(BATCH): Add BATCH_EXTRA.
(lisp/org-odt.elc): Force re-generation of this target every
time so that $(datadir) gets plumbed in to org-odt.el through
`org-odt-data-dir'.
(org-odt-data-dir): "FORCE" target. Also a variable defined
in org-odt.el.
(install-etc): Rename this target to install-data.
(install-data): Was install-etc.
--8<---------------cut here---------------end--------------->8---
Ulrich Mueller <ulm@gentoo.org> writes:
> Hi,
> In Gentoo we have an issue with the location of the OpenDocument style
> files, reported to us in bug 396269 [1].
>
> When org-mode is installed as a separate Gentoo package, its lisp
> files are installed in /usr/share/emacs/site-lisp/org-mode/.
> According to our policy, non-lisp files would go to
> /usr/share/emacs/etc/org-mode/. We would pass this as the "etcdir"
> parameter to "make install", so the odt style files would be installed
> in stylesdir = /usr/share/emacs/etc/org-mode/styles/.
>
> Now org-odt.el currently defines org-odt-styles-dir in a defconst,
> and it searches only in ../etc/styles/, ./etc/styles/, and ./etc/org/
> relative to lispdir. Obviously it cannot find the files in the Gentoo
> location.
>
> Now my question, could the defconst be changed to a defvar, so that we
> can specify the location in our site-start file? Or, preferably, could
> the etcdir specified in "make" command be honoured in the lisp code?
>
> Ulrich
>
> [1] <https://bugs.gentoo.org/show_bug.cgi?id=396269>
>
>
--
next prev parent reply other threads:[~2011-12-30 19:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-29 11:24 Location of OpenDocument style files should be configurable Ulrich Mueller
2011-12-29 16:06 ` Jambunathan K
2011-12-29 16:56 ` Ulrich Mueller
2011-12-30 9:07 ` Achim Gratz
2011-12-29 16:56 ` Achim Gratz
2011-12-29 18:32 ` Ulrich Mueller
2011-12-30 19:53 ` Jambunathan K [this message]
2011-12-31 0:07 ` Ulrich Mueller
2012-01-01 18:35 ` Ulrich Mueller
2012-01-01 20:43 ` Ulrich Mueller
2012-01-02 14:10 ` Jambunathan K
2012-01-03 9:38 ` Ulrich Mueller
2012-01-03 10:20 ` Bastien
2012-01-03 14:59 ` Ulrich Mueller
2012-01-03 10:26 ` Bastien
2012-01-03 13:59 ` Ulrich Mueller
2012-02-24 11:01 ` Jambunathan K
2012-02-24 11:20 ` Jambunathan K
2012-01-02 22:11 ` Achim Gratz
2012-01-03 10:10 ` Ulrich Mueller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81k45du97t.fsf@gmail.com \
--to=kjambunathan@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=ulm@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).