also conform to the includes in name-vmaj dir policy

SVN revision: 50181

diff --git a/Makefile.am b/Makefile.am
index d7a58bdefc809066a397211e2c570dd7ca1406ad..3214b64f4c0bab826dc1a475e31b699af7276f06 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,6 @@ EXTRA_DIST = README AUTHORS COPYING autogen.sh elementary.pc.in elementary.spec
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = elementary.pc
 
-installed_headersdir = $(prefix)/include/elementary
-installed_headers_DATA = elementary_config.h
-
 .PHONY: doc
 
 doc:

diff --git a/elementary.pc.in b/elementary.pc.in
index 307d3ade010b2c166f45d381cc88ca838ea3c41a..f63a1c8fa5593a4ab0a3be4ea422093f37798a0a 100644 (file)
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -9,4 +9,4 @@ Description: Mobile device touchscreen widget library
 Version: @VERSION@
 Libs: -L${libdir} -lelementary
 Libs.private: @dlopen_libs@ @my_libs@
-Cflags: -I${includedir} -I${includedir}/elementary
+Cflags: -I${includedir} -I${includedir}/elementary-@VMAJ@

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e16578a715fba492f88390dc8e24bf1cc4262d6f..ce96d9c3738711e3a529369442ce71bf2c9a539d 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -25,7 +25,8 @@ endif
 
 lib_LTLIBRARIES = libelementary.la
 
-include_HEADERS = Elementary.h
+includes_HEADERS = Elementary.h
+includesdir = $(includedir)/elementary-@VMAJ@
 
 libelementary_la_SOURCES = \
 elm_priv.h \