install headers in $prefix/include/eina-$VERSION_MAJOR to allow parralel

installations between different major versions


SVN revision: 35251

legacy/eina/configure.in

@@ -21,6 +21,7 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
 VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
 SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
 version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
+AC_SUBST(VMAJ)
 AC_SUBST(version_info)
 
 # Checks for programs

legacy/eina/eina.pc.in

@@ -8,5 +8,5 @@ Description: Eina
 Requires: 
 Version: @VERSION@
 Libs: -L${libdir} -leina
-Libs.private: -lm -ldl
-Cflags: -I${includedir} -I${includedir}/eina
+Libs.private: -ldl
+Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina

legacy/eina/src/include/Makefile.am

@@ -14,8 +14,8 @@ eina_rectangle.h \
 eina_types.h \
 eina_stringshare.h
 
-include_HEADERS = \
-Eina.h
+installed_mainheaderdir = $(prefix)/include/eina-@VMAJ@
+installed_mainheader_DATA = Eina.h
 
-installed_headersdir = $(prefix)/include/eina
+installed_headersdir = $(prefix)/include/eina-@VMAJ@/eina
 installed_headers_DATA = $(EINAHEADERS)

legacy/eina/src/lib/.cvsignore

@@ -1,3 +1,4 @@
 Makefile.in
 Makefile
+*.lo
 .deps

legacy/eina/src/modules/mm_policies/.cvsignore

@@ -1,3 +1,6 @@
 Makefile.in
 Makefile
+*.la
+*.lo
+.libs
 .deps