From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ulrich Mueller Subject: Re: Location of OpenDocument style files should be configurable Date: Sun, 1 Jan 2012 21:43:57 +0100 Message-ID: <20224.50573.418581.674268@a1i15.kph.uni-mainz.de> References: <20220.19946.360761.625682@a1i15.kph.uni-mainz.de> <81k45du97t.fsf@gmail.com> <20222.21041.522506.741641@a1i15.kph.uni-mainz.de> <20224.42871.411055.861546@a1i15.kph.uni-mainz.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:39203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhSGA-0005gd-RV for emacs-orgmode@gnu.org; Sun, 01 Jan 2012 15:44:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhSG9-0007wj-KM for emacs-orgmode@gnu.org; Sun, 01 Jan 2012 15:44:02 -0500 Received: from a1iwww1.kph.uni-mainz.de ([134.93.134.1]:53742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhSG9-0007wd-BJ for emacs-orgmode@gnu.org; Sun, 01 Jan 2012 15:44:01 -0500 In-Reply-To: <20224.42871.411055.861546@a1i15.kph.uni-mainz.de> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org 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 ; -- 1.7.8.1