From 0fec718cb1441cdeca8534659858e2ae316ac40d Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sun, 11 Jul 2010 23:34:49 +0000
Subject: [PATCH] also conform to the includes in name-vmaj dir policy

SVN revision: 50181
---
 legacy/elementary/Makefile.am         | 3 ---
 legacy/elementary/elementary.pc.in    | 2 +-
 legacy/elementary/src/lib/Makefile.am | 3 ++-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/legacy/elementary/Makefile.am b/legacy/elementary/Makefile.am
index d7a58bdefc..3214b64f4c 100644
--- a/legacy/elementary/Makefile.am
+++ b/legacy/elementary/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/legacy/elementary/elementary.pc.in b/legacy/elementary/elementary.pc.in
index 307d3ade01..f63a1c8fa5 100644
--- a/legacy/elementary/elementary.pc.in
+++ b/legacy/elementary/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/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index e16578a715..ce96d9c373 100644
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/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 \