Fix include dir to be only major.minor version

diff --git a/CommonAPI.pc.in b/CommonAPI.pc.in
index 1c3fe1c..015516b 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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"