[packages/hhvm/dev-3.6] set cmake CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_INCLUDEDIR relative

[glen]

commit d3323c57f7998395fafd0562e68cf13c864d7972
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 7 16:43:45 2015 +0300

    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

 hhvm.spec | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 17829e9..3cc3955 100644
--- 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}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/d3323c57f7998395fafd0562e68cf13c864d7972