summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Denis-Courmont <remi.denis-courmont@nokia.com>2011-01-19 12:30:56 +0200
committerMarcel Holtmann <marcel@holtmann.org>2011-01-19 12:18:13 +0100
commita2bad5b65bf2b5b2b5e77c4f775f74e61d3b9649 (patch)
treecddcd1353940c5afa8498f4270fb59b9afcbee2a
parent2126700c3e51f5d983cf9a11bf8bc84985ad469f (diff)
downloadofono-a2bad5b65bf2b5b2b5e77c4f775f74e61d3b9649.tar.bz2
build: Use standard pkginclude directory
automake automatically defines includedir to the base include directory and pkgincludedir to ./@PACKAGE@ from there. So lets use the later one instead of overriding automake.
-rw-r--r--Makefile.am9
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index da59be79..c1c34ca8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
AM_MAKEFLAGS = --no-print-directory
-includedir = @includedir@/ofono
-
-include_HEADERS = include/log.h include/plugin.h include/history.h \
+pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
include/dbus.h include/modem.h include/types.h \
include/call-barring.h include/call-forwarding.h \
include/call-meter.h include/call-settings.h \
@@ -17,9 +15,10 @@ include_HEADERS = include/log.h include/plugin.h include/history.h \
include/ctm.h include/cdma-voicecall.h \
include/cdma-sms.h
-nodist_include_HEADERS = include/version.h
+nodist_pkginclude_HEADERS = include/version.h
-local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS), \
+local_headers = $(foreach file,$(pkginclude_HEADERS) \
+ $(nodist_pkginclude_HEADERS), \
include/ofono/$(notdir $(file)))