From: Adrien Nader <adrien@notk.org>
To: Yoriyuki Yamagata <yoriyuki.y@gmail.com>
Cc: Caml List <caml-list@inria.fr>
Subject: Re: [Caml-list] [ANN] Camomile 0.8.5
Date: Sun, 15 Sep 2013 17:43:08 +0200 [thread overview]
Message-ID: <20130915154308.GA1878@notk.org> (raw)
In-Reply-To: <CALdQWQ6entt8y-+kdGQxY--858YB8S-1Mc+pS5iunhwyFPbNvw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
Hi,
On Sun, Sep 15, 2013, Yoriyuki Yamagata wrote:
> Dear list,
>
> I am pleased to announce the new release of Camomile, a Unicode
> library for OCaml. This release is a bug fix release. You can download
> the new version from
> https://github.com/yoriyuki/Camomile/releases/tag/rel-0.8.5
>
> You can find the general information at the Wiki
> https://github.com/yoriyuki/Camomile/wiki
I've found an issue with the install procedure: it doesn't use
$(DESTDIR) for everything.
I'm attaching a patch for that. I'm not getting permission errors
anymore when running make install DESTDIR=foo as a regular user now.
--
Adrien Nader
[-- Attachment #2: 0001-Makefile.in-add-several-DESTDIR.patch --]
[-- Type: text/x-diff, Size: 4223 bytes --]
From c0634427527be34b6887e043f810f0ce513874ed Mon Sep 17 00:00:00 2001
From: Adrien Nader <adrien@notk.org>
Date: Sun, 15 Sep 2013 17:02:58 +0200
Subject: [PATCH] Makefile.in: add several $(DESTDIR).
---
Makefile.in | 54 +++++++++++++++++++++++++++---------------------------
3 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 28ca896..098792a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -389,18 +389,18 @@ MLI = camomileLibrary.mli camomileLibraryDefault.mli camomileLibraryDyn.mli
install: $(INSTALL) install-data
install-without-ocamlfind:
- mkdir -p $(OCAMLLIB)
- cp -f camomileLibrary.cmi '$(OCAMLLIB)'
- cp -f camomileLibraryDefault.cmi '$(OCAMLLIB)'
- cp -f camomileLibraryDyn.cmi '$(OCAMLLIB)'
- if [ -f camomileLibrary.cmx ]; then cp -f camomileLibrary.cmx '$(OCAMLLIB)'; fi
- if [ -f camomileLibrary.cma ]; then cp -f camomileLibrary.cma '$(OCAMLLIB)'; fi
- if [ -f camomileLibrary.cmxa ]; then cp -f camomileLibrary.cmxa '$(OCAMLLIB)'; fi
- if [ -f camomileLibraryDefault.cmx ]; then cp -f camomileLibraryDefault.cmx '$(OCAMLLIB)'; fi
- if [ -f camomileLibraryDyn.cmx ]; then cp -f camomileLibraryDyn.cmx '$(OCAMLLIB)'; fi
- if [ -f camomile.cma ]; then cp -f camomile.cma '$(OCAMLLIB)'; fi
- if [ -f camomile.cmxa ]; then cp -f camomile.cmxa '$(OCAMLLIB)'; fi
- if [ -f camomile.a ]; then cp -f camomile.a '$(OCAMLLIB)'; fi
+ mkdir -p $(DESTDIR)$(OCAMLLIB)
+ cp -f camomileLibrary.cmi '$(DESTDIR)$(OCAMLLIB)'
+ cp -f camomileLibraryDefault.cmi '$(DESTDIR)$(OCAMLLIB)'
+ cp -f camomileLibraryDyn.cmi '$(DESTDIR)$(OCAMLLIB)'
+ if [ -f camomileLibrary.cmx ]; then cp -f camomileLibrary.cmx '$(DESTDIR)$(OCAMLLIB)'; fi
+ if [ -f camomileLibrary.cma ]; then cp -f camomileLibrary.cma '$(DESTDIR)$(OCAMLLIB)'; fi
+ if [ -f camomileLibrary.cmxa ]; then cp -f camomileLibrary.cmxa '$(DESTDIR)$(OCAMLLIB)'; fi
+ if [ -f camomileLibraryDefault.cmx ]; then cp -f camomileLibraryDefault.cmx '$(DESTDIR)$(OCAMLLIB)'; fi
+ if [ -f camomileLibraryDyn.cmx ]; then cp -f camomileLibraryDyn.cmx '$(DESTDIR)$(OCAMLLIB)'; fi
+ if [ -f camomile.cma ]; then cp -f camomile.cma '$(DESTDIR)$(OCAMLLIB)'; fi
+ if [ -f camomile.cmxa ]; then cp -f camomile.cmxa '$(DESTDIR)$(OCAMLLIB)'; fi
+ if [ -f camomile.a ]; then cp -f camomile.a '$(DESTDIR)$(OCAMLLIB)'; fi
install-with-ocamlfind:
files= &&\
@@ -415,28 +415,28 @@ install-with-ocamlfind:
ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi camomileLibraryDefault.cmi camomileLibraryDyn.cmi
install-data:
- mkdir -p '$(DATADIR)'
- mkdir -p '$(DATADIR)'/camomile
- mkdir -p '$(DATADIR)'/camomile/database
- cp -f database/*.mar '$(DATADIR)'/camomile/database || true
- mkdir -p '$(DATADIR)'/camomile/charmaps
- cp -f charmaps/*.mar '$(DATADIR)'/camomile/charmaps || true
- mkdir -p '$(DATADIR)'/camomile/mappings
- cp -f mappings/*.mar '$(DATADIR)'/camomile/mappings || true
- mkdir -p '$(DATADIR)'/camomile/locales
- cp -f locales/*.mar '$(DATADIR)'/camomile/locales || true
+ mkdir -p '$(DESTDIR)$(DATADIR)'
+ mkdir -p '$(DESTDIR)$(DATADIR)'/camomile
+ mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/database
+ cp -f database/*.mar '$(DESTDIR)$(DATADIR)'/camomile/database || true
+ mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/charmaps
+ cp -f charmaps/*.mar '$(DESTDIR)$(DATADIR)'/camomile/charmaps || true
+ mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/mappings
+ cp -f mappings/*.mar '$(DESTDIR)$(DATADIR)'/camomile/mappings || true
+ mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/locales
+ cp -f locales/*.mar '$(DESTDIR)$(DATADIR)'/camomile/locales || true
uninstall: $(UNINSTALL)
uninstall-without-ocamlfind:
- rm -f '$(OCAMLLIB)'/camomile.*
- rm -f '$(OCAMLLIB)'/camomileLibrary.*
- rm -f '$(OCAMLLIB)'/camomileLibraryDefault.*
- rm -f '$(OCAMLLIB)'/camomileLibraryDyn.*
+ rm -f '$(DESTDIR)$(OCAMLLIB)'/camomile.*
+ rm -f '$(DESTDIR)$(OCAMLLIB)'/camomileLibrary.*
+ rm -f '$(DESTDIR)$(OCAMLLIB)'/camomileLibraryDefault.*
+ rm -f '$(DESTDIR)$(OCAMLLIB)'/camomileLibraryDyn.*
uninstall-with-ocamlfind:
ocamlfind remove camomile
- rm -fr '$(DATADIR)'/camomile
+ rm -fr '$(DESTDIR)$(DATADIR)'/camomile
###################################################################
# Generic rules
prev parent reply other threads:[~2013-09-15 15:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-15 9:09 Yoriyuki Yamagata
2013-09-15 15:43 ` Adrien Nader [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130915154308.GA1878@notk.org \
--to=adrien@notk.org \
--cc=caml-list@inria.fr \
--cc=yoriyuki.y@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.
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 NNTP newsgroup(s).