From patchwork Sun Jan 1 20:43:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Location of OpenDocument style files should be configurable Date: Mon, 02 Jan 2012 01:43:57 -0000 From: Ulrich Mueller X-Patchwork-Id: 1091 Message-Id: <20224.50573.418581.674268@a1i15.kph.uni-mainz.de> To: emacs-orgmode@gnu.org Cc: Jambunathan K > So, could the build system please be changed, such that the datadir > value at _compile_ time is taken, not at _install_ time? I.e., something like the patch included below. BTW, maybe one could think about supporting DESTDIR? That should be trivial to implement, simply prepend $(DESTDIR) to all destination paths in the install-* make targets. I can prepare a patch if this is wanted. Cheers, Ulrich >From f6eb5150418bfd5de35b8f4f9ca39f4cbff1d40b Mon Sep 17 00:00:00 2001 From: Ulrich Mueller Date: Sun, 1 Jan 2012 21:39:21 +0100 Subject: [PATCH] Don't re-compile org-odt.el at install time. --- Makefile | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 520b0fd..642b21f 100644 --- a/Makefile +++ b/Makefile @@ -247,14 +247,10 @@ p: g: ${MAKE} pdf && open doc/orgguide.pdf -# Always force re-compilation of org-odt -lisp/org-odt.elc: org-odt-data-dir -org-odt-data-dir: - # Sleight of hand to "hard code" the value of $(datadir) in # org-odt.el. See variables `org-odt-styles-dir-list' and # `org-odt-schema-dir-list'. -install-lisp: BATCH_EXTRA = -eval "(setq org-odt-data-dir (expand-file-name \"$(datadir)\"))" +lisp/org-odt.elc: BATCH_EXTRA = -eval "(setq org-odt-data-dir (expand-file-name \"$(datadir)\"))" install-lisp: $(LISPFILES) $(ELCFILES) if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;