-cp -p {parsing/{location,longident,parsetree},typing/typecore}.{cm,ml}i \
- $RPM_BUILD_ROOT%{_libdir}/%{name}
+# symlink .opt versions of compilers (if present)
+for f in ocamlc ocamlopt; do
+ if test -f $RPM_BUILD_ROOT%{_bindir}/$f.opt; then
+ mv -f $RPM_BUILD_ROOT%{_bindir}/$f \
+ $RPM_BUILD_ROOT%{_bindir}/$f.byte
+ ln -sf %{_bindir}/$f.opt $RPM_BUILD_ROOT%{_bindir}/$f
+ fi
+done
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.ml{,i}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*/*.ml{,i}
+
+# move includes to the proper place
+install -d $RPM_BUILD_ROOT%{_includedir}
+mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/caml $RPM_BUILD_ROOT%{_includedir}/caml
+# but leave compatibility symlink
+ln -s ../../include/caml $RPM_BUILD_ROOT%{_libdir}/%{name}/caml