Install headers into destdir/include/rumprun.

That way they don't conflict with anything already
in destdir/include.

diff --git a/app-tools/specs-compile_or_ferment.in b/app-tools/specs-compile_or_ferment.in
index 8dfdf3c57da4b1b56bf4f53634dda897bca9da1e..306feafe347647aaa8ff0cb3b3d519c24a676a68 100644 (file)
--- a/app-tools/specs-compile_or_ferment.in
+++ b/app-tools/specs-compile_or_ferment.in
@@ -1,7 +1,7 @@
 %rename cpp_options old_cpp_options
  
 *cpp_options:
--nostdinc -isystem !DESTDIR!/include %{,c++:%{!std=*:-std=c++11}} %{,c++:-isystem !DESTDIR!/include/c++} %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__
+-nostdinc -isystem !DESTDIR!/include/rumprun %{,c++:%{!std=*:-std=c++11}} %{,c++:-isystem !DESTDIR!/include/rumprun/c++} %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__
 
 %rename cc1_options old_cc1_options
 

diff --git a/build-rr.sh b/build-rr.sh
index f350a666d541b66975429e29a89d838acbcb7e4a..a566fa6567dcd4e9f26691d0a29ce2c87611e52a 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -435,7 +435,10 @@ doinstall ()
 
        MACHINE_ARCH=$(cat ${RROBJ}/.machine_arch)
 
-       mkdir -p ${RRDEST} || die cannot create ${RRDEST}
+       mkdir -p ${RRDEST}/include/rumprun \
+           || die cannot create ${RRDEST}/include/rumprun
+
+       # copy everything except include
        (
                # first, move things to where we want them to be
                cd ${STAGING}
@@ -451,9 +454,13 @@ doinstall ()
                        ln -s ../rumprun-${MACHINE_ARCH}/lib${x}.a \
                            lib/rumprun-${PLATFORM}-${MACHINE_ARCH}/lib${x}.a
                done
-
-               tar -cf - .
+               find . -maxdepth 1 \! -path . \! -path ./include\* \
+                   | xargs tar -cf -
        ) | (cd ${RRDEST} ; tar -xf -)
+
+       # copy include to destdir/include/rumprun
+       ( cd ${STAGING}/include ; tar -cf - . ) \
+           | ( cd ${RRDEST}/include/rumprun ; tar -xf - )
 }
 
 #