summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-07-11 23:34:49 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-07-11 23:34:49 +0000
commit1699eb48f1c2e1b62840f9a99eeb758bb251aaa9 (patch)
tree0bc059ff450c5572288ec5fbe07a17ef76bc843c
parent0f4120738fcec4f1e459305aca15d65148061519 (diff)
also conform to the includes in name-vmaj dir policy
SVN revision: 50181
Diffstat (limited to '')
-rw-r--r--Makefile.am3
-rw-r--r--elementary.pc.in2
-rw-r--r--src/lib/Makefile.am3
3 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index d7a58bdef..3214b64f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,6 @@ EXTRA_DIST = README AUTHORS COPYING autogen.sh elementary.pc.in elementary.spec
12pkgconfigdir = $(libdir)/pkgconfig 12pkgconfigdir = $(libdir)/pkgconfig
13pkgconfig_DATA = elementary.pc 13pkgconfig_DATA = elementary.pc
14 14
15installed_headersdir = $(prefix)/include/elementary
16installed_headers_DATA = elementary_config.h
17
18.PHONY: doc 15.PHONY: doc
19 16
20doc: 17doc:
diff --git a/elementary.pc.in b/elementary.pc.in
index 307d3ade0..f63a1c8fa 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -9,4 +9,4 @@ Description: Mobile device touchscreen widget library
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lelementary 10Libs: -L${libdir} -lelementary
11Libs.private: @dlopen_libs@ @my_libs@ 11Libs.private: @dlopen_libs@ @my_libs@
12Cflags: -I${includedir} -I${includedir}/elementary 12Cflags: -I${includedir} -I${includedir}/elementary-@VMAJ@
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e16578a71..ce96d9c37 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -25,7 +25,8 @@ endif
25 25
26lib_LTLIBRARIES = libelementary.la 26lib_LTLIBRARIES = libelementary.la
27 27
28include_HEADERS = Elementary.h 28includes_HEADERS = Elementary.h
29includesdir = $(includedir)/elementary-@VMAJ@
29 30
30libelementary_la_SOURCES = \ 31libelementary_la_SOURCES = \
31elm_priv.h \ 32elm_priv.h \