Install headers under $includedir/starpu/1.0.

Makefile.am

@@ -45,7 +45,7 @@ if USE_MPI
 pkgconfig_DATA += libstarpumpi.pc
 endif
 
-versincludedir = $(includedir)/starpu-$(STARPU_EFFECTIVE_VERSION)
+versincludedir = $(includedir)/starpu/$(STARPU_EFFECTIVE_VERSION)
 versinclude_HEADERS = 				\
 	include/starpu.h			\
 	include/starpu_data_filters.h		\

examples/starpufft/Makefile.am

@@ -34,7 +34,7 @@ EXTRA_DIST =			\
 	testf_threads.c		\
 	test_threads.c
 
-versincludedir = $(includedir)/starpu-$(STARPU_EFFECTIVE_VERSION)
+versincludedir = $(includedir)/starpu/$(STARPU_EFFECTIVE_VERSION)
 versinclude_HEADERS = 				\
 	starpufft.h
 

examples/starpufft/libstarpufft.pc.in

@@ -22,6 +22,6 @@ includedir=@includedir@
 Name: starpufft
 Description: offers support for heterogeneous multicore architecture
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}/starpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
+Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
 Libs: -L${libdir} -lstarpufft
 Libs.private: @LDFLAGS@ @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@

libstarpu.pc.in

@@ -22,7 +22,7 @@ includedir=@includedir@
 Name: starpu
 Description: offers support for heterogeneous multicore architecture
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}/starpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
+Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
 Libs: -L${libdir} -lstarpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_LDFLAGS@ @STARPU_OPENCL_LDFLAGS@
 Libs.private: @LDFLAGS@ @LIBS@
 Requires: @HWLOC_REQUIRES@

libstarpumpi.pc.in

@@ -22,7 +22,7 @@ includedir=@includedir@
 Name: starpumpi
 Description: offers MPI support for heterogeneous multicore architecture
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}/starpu-@STARPU_EFFECTIVE_VERSION@
+Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@
 Libs: -L${libdir} -lstarpumpi
 Libs.private: @LDFLAGS@ @LIBS@
 Requires: libstarpu

mpi/Makefile.am

@@ -71,7 +71,7 @@ noinst_HEADERS =					\
 	starpu_mpi_private.h				\
 	starpu_mpi_fxt.h
 
-versincludedir = $(includedir)/starpu-$(STARPU_EFFECTIVE_VERSION)
+versincludedir = $(includedir)/starpu/$(STARPU_EFFECTIVE_VERSION)
 versinclude_HEADERS = 				\
 	starpu_mpi.h					\
 	starpu_mpi_datatype.h