fix devel headers install, previous code copied all headers

diff --git a/hhvm.spec b/hhvm.spec
index 02cc5e58ab161032ba74fb218e968996fe25f446..e09d58862cc610c1a148fba8b9ca8ba5def58b13 100644 (file)
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -282,19 +282,29 @@ sed -e "
 oIFS=$IFS
 IFS=";"
 set -- $(sed -ne 's/set(HHVM_INCLUDE_DIRS "\(.*\)")/\1/p' hphp/tools/hphpize/hphpize.cmake)
-for dir in "$@"; do
-       case "$dir" in
-       $HPHP_HOME/?*)
-               find $dir -name '*.h' | while read file; do
-                       install -Dp $file $RPM_BUILD_ROOT%{_includedir}${file#$HPHP_HOME}
-               done
-       ;;
-       esac
-done
 IFS=$oIFS
-
-# fixup, broken due symlink
-mv $RPM_BUILD_ROOT%{_includedir}/hphp/{submodules/folly/folly,third_party}
+set -- $(
+       for dir in "$@"; do
+               [[ "$dir" = $HPHP_HOME/hphp/* ]] && echo $dir
+       done
+)
+
+set +x
+for dir in "$@" \
+       $HPHP_HOME/hphp/runtime \
+       $HPHP_HOME/hphp/util \
+       $HPHP_HOME/hphp/neo \
+       $HPHP_HOME/hphp/system \
+       $HPHP_HOME/hphp/parser \
+; do
+       echo "D %{_includedir}${dir#$HPHP_HOME}"
+       find $dir -name '*.h' | while read path; do
+               file=%{_includedir}${path#$HPHP_HOME}
+               echo "F $file"
+               install -Dp $path $RPM_BUILD_ROOT$file
+       done
+done
+set -x
 
 %clean
 rm -rf $RPM_BUILD_ROOT