Przeglądaj źródła

Install headers under $includedir/MAJOR.MINOR.

Ludovic Courtès 13 lat temu
rodzic
commit
54c9f167cf
2 zmienionych plików z 4 dodań i 3 usunięć
  1. 3 2
      Makefile.am
  2. 1 1
      libstarpu.pc.in

+ 3 - 2
Makefile.am

@@ -45,7 +45,8 @@ if USE_MPI
 pkgconfig_DATA += libstarpumpi.pc
 endif
 
-include_HEADERS = 				\
+versincludedir = $(includedir)/$(STARPU_EFFECTIVE_VERSION)
+versinclude_HEADERS = 				\
 	include/starpu.h			\
 	include/starpu_data_filters.h		\
 	include/starpu_data_interfaces.h	\
@@ -64,7 +65,7 @@ include_HEADERS = 				\
 	include/starpu_top.h			\
 	include/starpu_deprecated_api.h
 
-nodist_include_HEADERS = 			\
+nodist_versinclude_HEADERS = 			\
 	include/starpu_config.h
 
 if BUILD_STARPU_TOP

+ 1 - 1
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_CUDA_CPPFLAGS@
+Cflags: -I${includedir}/@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@