From: Ulrich Mueller <ulm@gentoo.org>
To: Bastien <bzg@altern.org>
Cc: emacs-orgmode@gnu.org, Jambunathan K <kjambunathan@gmail.com>
Subject: Re: Location of OpenDocument style files should be configurable
Date: Tue, 3 Jan 2012 14:59:37 +0100 [thread overview]
Message-ID: <20227.2505.411437.609469@a1i15.kph.uni-mainz.de> (raw)
In-Reply-To: <878vlpulnl.fsf@gnu.org>
>>>>> On Tue, 03 Jan 2012, Bastien wrote:
>>> It would be wonderful if you could provide a patch (and a usage
>>> note).
>>
>> Included below.
> Please add more explanations in such patches -- Jambunathan's
> explanations are a model of clarity and detailfulness.
Sorry. Please find an updated patch below.
Cheers,
Ulrich
From 9af8ea97022e23231395046bcfbf5f1e71ac5f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Mon, 2 Jan 2012 22:00:38 +0100
Subject: [PATCH] Support DESTDIR in Makefile.
From the GNU coding standards:
`DESTDIR' is a variable prepended to each installed target file. [...]
This provides for "staged installs", where the installed files are not
placed directly into their expected location but are instead copied
into a temporary location (`DESTDIR'). However, installed files
maintain their relative directory structure and any embedded file
names will not be modified.
---
Makefile | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 642b21f..4f06c4e 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,9 @@ datadir = $(prefix)/share/emacs/etc
# Where info files go
infodir = $(prefix)/share/info
+# Alternate destination root directory for staged installs
+DESTDIR =
+
##----------------------------------------------------------------------
## YOU MAY NEED TO EDIT THESE
##----------------------------------------------------------------------
@@ -253,18 +256,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
next prev parent reply other threads:[~2012-01-03 13:59 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
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 [this message]
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=20227.2505.411437.609469@a1i15.kph.uni-mainz.de \
--to=ulm@gentoo.org \
--cc=bzg@altern.org \
--cc=emacs-orgmode@gnu.org \
--cc=kjambunathan@gmail.com \
/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).