commit 4f7708f64a5f3aef63708984bf38d723c4dbcb28
Author: Jan Rękorajski <[email protected]>
Date: Tue Jun 6 19:23:58 2017 +0200
- fix install
- rel 2
destdir.patch | 38 ++++++++++++++++++++++++++++++++++++++
ocaml-menhir.spec | 4 +++-
2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/ocaml-menhir.spec b/ocaml-menhir.spec
index 2d9550f..46392e3 100644
--- a/ocaml-menhir.spec
+++ b/ocaml-menhir.spec
@@ -11,11 +11,12 @@
Summary: LR(1) parser generator for the OCaml programming language
Name: ocaml-%{module}
Version: 20170509
-Release: 1
+Release: 2
License: GPL v2
Group: Libraries
Source0:
http://gallium.inria.fr/~fpottier/menhir/%{module}-%{version}.tar.gz
# Source0-md5: b8ba18b5abda831cf41cd4fa65f4c51b
+Patch0: destdir.patch
URL: http://gallium.inria.fr/~fpottier/menhir/
BuildRequires: ocaml >= 3.04-7
BuildRequires: ocaml-ocamlbuild
@@ -56,6 +57,7 @@ menhir.
%prep
%setup -q -n %{module}-%{version}
+%patch0 -p1
%build
%{__make} PREFIX=%{_prefix} USE_OCAMLFIND=true all
diff --git a/destdir.patch b/destdir.patch
new file mode 100644
index 0000000..eab884c
--- /dev/null
+++ b/destdir.patch
@@ -0,0 +1,38 @@
+--- menhir-20170509/Makefile~ 2017-05-09 21:26:09.000000000 +0200
++++ menhir-20170509/Makefile 2017-06-06 19:09:55.839985076 +0200
+@@ -178,11 +178,11 @@
+
+ install:
+ # Install the executable.
+- mkdir -p $(bindir)
+- install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/$(MENHIREXE)
++ mkdir -p $(DESTDIR)$(bindir)
++ install $(BUILDDIR)/menhir.$(TARGET) $(DESTDIR)$(bindir)/$(MENHIREXE)
+ # Install Menhir's standard library.
+- mkdir -p $(libdir)
+- install -m 644 $(MLYLIB) $(libdir)
++ mkdir -p $(DESTDIR)$(libdir)
++ install -m 644 $(MLYLIB) $(DESTDIR)$(libdir)
+ # Install MenhirLib and MenhirSdk.
+ @if `$(BUILDDIR)/menhir.$(TARGET) --suggest-ocamlfind | tr -d '\r'` ;
then \
+ echo 'Installing MenhirLib and MenhirSdk via ocamlfind.' ; \
+@@ -193,14 +193,14 @@
+ rm -f META ; \
+ else \
+ echo 'Installing MenhirLib and MenhirSdk manually.' ; \
+- install -m 644 $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) $(libdir) ; \
+- install -m 644 $(patsubst %,$(SDKDIR)/%,$(MENHIRSDK)) $(libdir) ; \
++ install -m 644 $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB))
$(DESTDIR)$(libdir) ; \
++ install -m 644 $(patsubst %,$(SDKDIR)/%,$(MENHIRSDK))
$(DESTDIR)$(libdir) ; \
+ fi
+ # Install the documentation, if it has been built.
+ if [ -f manual.pdf ] ; then \
+- mkdir -p $(docdir) $(mandir) && \
+- cp -r $(DOCS) $(docdir) && \
+- cp -r $(MANS) $(mandir) ; \
++ mkdir -p $(DESTDIR)$(docdir) $(DESTDIR)$(mandir) && \
++ cp -r $(DOCS) $(DESTDIR)$(docdir) && \
++ cp -r $(MANS) $(DESTDIR)$(mandir) ; \
+ fi
+
+ uninstall:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ocaml-menhir.git/commitdiff/4f7708f64a5f3aef63708984bf38d723c4dbcb28
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
