Subject: Re: Location of OpenDocument style files should be configurable
Newsgroups: gmane.emacs.orgmode
Date: 2012-01-03 09:38:39 GMT (19 weeks, 1 day, 6 hours and 1 minute ago)
>>>>> On Mon, 02 Jan 2012, Jambunathan K wrote: >> 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. >> <http://www.gnu.org/prep/standards/html_node/DESTDIR.html> > It would be wonderful if you could provide a patch (and a usage > note). Included below. > ps: Makefiles are beyond my jurisdiction. I will let Bastien act on > your patch(es). Looks like my earlier patch hasn't been applied for 7.8.03. :( Cheers, Ulrich From 274fc9a41d7e573bc67a85ffad046ca163dc6452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm <at> gentoo.org> Date: Mon, 2 Jan 2012 22:00:38 +0100 Subject: [PATCH] Support DESTDIR in Makefile. --- Makefile | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 642b21f..b6ad567 100644 --- a/Makefile +++ b/Makefile @@ -253,18 +253,21 @@ g: 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 ; - $(CP) $(LISPFILES) $(lispdir) - $(CP) $(ELCFILES) $(lispdir) + if [ ! -d $(DESTDIR)$(lispdir) ]; then \ + $(MKDIR) $(DESTDIR)$(lispdir); else true; fi ; + $(CP) $(LISPFILES) $(DESTDIR)$(lispdir) + $(CP) $(ELCFILES) $(DESTDIR)$(lispdir) install-info: $(INFOFILES) - if [ ! -d $(infodir) ]; then $(MKDIR) $(infodir); else true; fi ; - $(CP) $(INFOFILES) $(infodir) - $(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES) + if [ ! -d $(DESTDIR)$(infodir) ]; then \ + $(MKDIR) $(DESTDIR)$(infodir); else true; fi ; + $(CP) $(INFOFILES) $(DESTDIR)$(infodir) + $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) $(INFOFILES) install-data: $(DATAFILES) - if [ ! -d $(datadir) ]; then $(MKDIR) $(datadir); else true; fi ; - $(CP) $(DATAFILES) $(datadir) + if [ ! -d $(DESTDIR)$(datadir) ]; then \ + $(MKDIR) $(DESTDIR)$(datadir); else true; fi ; + $(CP) $(DATAFILES) $(DESTDIR)$(datadir) autoloads: lisp/org-install.el -- 1.7.8.2