diff options
| author | Johannes Schanda <schanda@itestra.de> | 2013-10-23 17:33:41 +0200 |
|---|---|---|
| committer | Johannes Schanda <schanda@itestra.de> | 2013-10-23 17:33:41 +0200 |
| commit | 3fa9c2af5733657c1c3bf48a0a2d38525c16f6ed (patch) | |
| tree | 1031d540e1f361ca748854bfae7d2044715f6ba8 | |
| parent | 8342f06f7cb59c2436e0e052cdada3d4051cb266 (diff) | |
| download | genivi-common-api-runtime-3fa9c2af5733657c1c3bf48a0a2d38525c16f6ed.tar.gz | |
Fix include dir to be only major.minor version
| -rw-r--r-- | CommonAPI.pc.in | 2 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/CommonAPI.pc.in b/CommonAPI.pc.in index 1c3fe1c..015516b 100644 --- a/CommonAPI.pc.in +++ b/CommonAPI.pc.in @@ -7,4 +7,4 @@ Name: Common API C++ Description: GENIVI Common API C++ Library Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lCommonAPI -Cflags: -I${includedir}/CommonAPI-@PACKAGE_VERSION@
\ No newline at end of file +Cflags: -I${includedir}/CommonAPI-@COMMONAPI_API_HEADER_VERSION@
\ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 00ea629..d65f15c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ libCommonAPI_la_SOURCES = \ src/CommonAPI/ServicePublisher.cpp \ src/CommonAPI/ContainerUtils.cpp -CommonAPI_includedir=$(includedir)/CommonAPI-${VERSION}/CommonAPI +CommonAPI_includedir=$(includedir)/CommonAPI-${COMMONAPI_API_HEADER_VERSION}/CommonAPI CommonAPI_include_HEADERS = \ src/CommonAPI/Attribute.h \ src/CommonAPI/AttributeExtension.h \ @@ -83,7 +83,7 @@ check_PROGRAMS = \ TESTS = ${check_PROGRAMS} -VariantTest_includedir=$(includedir)/CommonAPI-${VERSION}/CommonAPI +VariantTest_includedir=$(includedir)/CommonAPI-${COMMONAPI_API_HEADER_VERSION}/CommonAPI VariantTest_SOURCES = src/test/VariantTest.cpp VariantTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS} VariantTest_CXXFLAGS = ${GTEST_CXXFLAGS} -Isrc diff --git a/configure.ac b/configure.ac index 0f56ebe..acf54f8 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,8 @@ AX_CXX_COMPILE_STDCXX_11([noext]) LT_PREREQ(2.2) LT_INIT - - - +COMMONAPI_API_HEADER_VERSION="2.1" +AC_SUBST(COMMONAPI_API_HEADER_VERSION) GTEST_MIN_VERSION="1.6.0" GTEST_URL="http://code.google.com/p/googletest" |