set cmake CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_INCLUDEDIR relative

otherwise we end up installing to /usr/usr
https://github.com/facebook/hhvm/blob/HHVM-3.6.1/CMake/HPHPFunctions.cmake#L169-L176

diff --git a/hhvm.spec b/hhvm.spec
index 17829e9dcf1ba55cb220478c390a4ccd0bf6873a..3cc39558c85583c810896574dd0b76fefbde9942 100644 (file)
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -356,7 +356,9 @@ fi
 
 %cmake \
        $ccache \
-       -DCMAKE_PREFIX_PATH=%{_prefix} \
+       -DCMAKE_INSTALL_BINDIR=bin \
+       -DCMAKE_INSTALL_INCLUDEDIR=include \
+       -DCMAKE_INSTALL_LIBDIR=%{_lib} \
        -DHHVM_DYNAMIC_EXTENSION_DIR=%{hhvm_extensiondir} \
        -DMYSQL_UNIX_SOCK_ADDR=/var/lib/mysql/mysql.sock \
        -DUSE_JEMALLOC=%{!?with_jemalloc:OFF}%{?with_jemalloc:ON} \
@@ -392,14 +394,6 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
 if [ ! -f installed.stamp ]; then
 # begin install block
 
-# fix broken cmake rules
-# TODO: fix cmake rules
-if [ -d $RPM_BUILD_ROOT%{_prefix}/usr ]; then
-       cp -a $RPM_BUILD_ROOT%{_prefix}/usr/* $RPM_BUILD_ROOT%{_prefix}
-       rm -rf $RPM_BUILD_ROOT%{_prefix}/usr
-       sed -i -e '/HHVM_INSTALL_LIBDIR/ s,%{_libdir},%{_lib},' $RPM_BUILD_ROOT%{_bindir}/hhvm-gdb
-fi
-
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}}
 cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}