summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/libcaffeonacl.spec13
1 files changed, 7 insertions, 6 deletions
diff --git a/packaging/libcaffeonacl.spec b/packaging/libcaffeonacl.spec
index 33b7679a..00a9c33c 100644
--- a/packaging/libcaffeonacl.spec
+++ b/packaging/libcaffeonacl.spec
@@ -85,16 +85,18 @@ make all -j 5
make distribute
mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}%{_libdir}/distribute/include
mkdir -p %{buildroot}%{_libdir}/distribute/bin
-mkdir -p %{buildroot}%{_libdir}/distribute/proto
mkdir -p %{buildroot}%{_libdir}/distribute/python
+mkdir -p %{buildroot}%{_includedir}
+mkdir -p %{buildroot}%{_includedir}/caffe/include
+mkdir -p %{buildroot}%{_includedir}/caffe/proto
cp -r %{_builddir}/%{name}-%{version}/distribute/lib/lib* %{buildroot}%{_libdir}/
-cp -r %{_builddir}/%{name}-%{version}/distribute/include/* %{buildroot}%{_libdir}/distribute/include/
cp -r %{_builddir}/%{name}-%{version}/distribute/bin/* %{buildroot}%{_libdir}/distribute/bin/
-cp -r %{_builddir}/%{name}-%{version}/distribute/proto/* %{buildroot}%{_libdir}/distribute/proto/
cp -r %{_builddir}/%{name}-%{version}/distribute/python/* %{buildroot}%{_libdir}/distribute/python/
+cp -r %{_builddir}/%{name}-%{version}/distribute/include/* %{buildroot}%{_includedir}/caffe/include/
+cp -r %{_builddir}/%{name}-%{version}/distribute/proto/* %{buildroot}%{_includedir}/caffe/proto/
+cp -r %{_builddir}/%{name}-%{version}/.build_release/src/caffe/proto/caffe.pb.cc %{buildroot}%{_includedir}/caffe/proto/
%ifarch aarch64
%files -n %{name}-release-aarch64
@@ -111,7 +113,7 @@ cp -r %{_builddir}/%{name}-%{version}/distribute/python/* %{buildroot}%{_libdir}
%endif
%manifest %{name}.manifest
%{_libdir}/lib*
-%{_libdir}/distribute/include/*
+%{_includedir}/caffe/*
%ifarch aarch64
%files -n %{name}-tools-aarch64
@@ -120,6 +122,5 @@ cp -r %{_builddir}/%{name}-%{version}/distribute/python/* %{buildroot}%{_libdir}
%endif
%manifest %{name}.manifest
%{_libdir}/distribute/bin/*
-%{_libdir}/distribute/proto/*
%{_libdir}/distribute/python/*