[packages/ocaml-curses] install all to site-lib, then it ocamlfind can find .cmi

glen glen at pld-linux.org
Sat Aug 31 22:17:25 CEST 2013


commit 1eb77ff95a87f52bf542bed0b12aa2c88757b460
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Aug 31 23:16:56 2013 +0300

    install all to site-lib, then it ocamlfind can find .cmi

 ocaml-curses.spec | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/ocaml-curses.spec b/ocaml-curses.spec
index 7a7a0c8..b75fa7c 100644
--- a/ocaml-curses.spec
+++ b/ocaml-curses.spec
@@ -50,34 +50,30 @@ developing applications that use %{name}.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib
 install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 ocamlfind install curses META *.cmi *.cmx *.cma *.cmxa *.a *.so *.mli
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/curses
-mv $OCAMLFIND_DESTDIR/curses/META $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/curses
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/ocaml/curses
-%exclude %{_libdir}/ocaml/curses/*.mli
+%{_libdir}/ocaml/site-lib/curses
+%exclude %{_libdir}/ocaml/site-lib/curses/*.mli
 %if %{with opt}
-%exclude %{_libdir}/ocaml/curses/*.a
-%exclude %{_libdir}/ocaml/curses/*.cmxa
-%exclude %{_libdir}/ocaml/curses/*.cmx
+%exclude %{_libdir}/ocaml/site-lib/curses/*.a
+%exclude %{_libdir}/ocaml/site-lib/curses/*.cmxa
+%exclude %{_libdir}/ocaml/site-lib/curses/*.cmx
 %endif
-%attr(755,root,root) %{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
-%{_libdir}/ocaml/site-lib/curses
+%attr(755,root,root) %{_libdir}/ocaml/site-lib/stublibs/*.so
+%{_libdir}/ocaml/site-lib/stublibs/*.so.owner
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/ocaml/curses/*.mli
+%{_libdir}/ocaml/site-lib/curses/*.mli
 %if %{with opt}
-%{_libdir}/ocaml/curses/*.a
-%{_libdir}/ocaml/curses/*.cmxa
-%{_libdir}/ocaml/curses/*.cmx
+%{_libdir}/ocaml/site-lib/curses/*.a
+%{_libdir}/ocaml/site-lib/curses/*.cmxa
+%{_libdir}/ocaml/site-lib/curses/*.cmx
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-curses.git/commitdiff/1eb77ff95a87f52bf542bed0b12aa2c88757b460



More information about the pld-cvs-commit mailing list