summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-03-21 20:52:28 -0500
committerDarrell Anderson <[email protected]>2012-03-21 20:52:28 -0500
commitfd9474fd52cecf326904f9bae523b75b0c3645c7 (patch)
tree5df5fcf73322316b49f0f2a7e89234d1ecc4ae3d
parent993b42cfe2c82bfeb74f39426fd0aab601bdd0ac (diff)
downloadlibcarddav-fd9474fd52cecf326904f9bae523b75b0c3645c7.tar.gz
libcarddav-fd9474fd52cecf326904f9bae523b75b0c3645c7.zip
Fix installation locations.
This partially resolves bug report 701.
-rw-r--r--libcarddav.pc.in2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/libcarddav.pc.in b/libcarddav.pc.in
index b454e6e..66673f1 100644
--- a/libcarddav.pc.in
+++ b/libcarddav.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-pkglibdir=${libdir}/@PACKAGE@
+pkglibdir=${libdir}
pkgincludedir=${includedir}/@PACKAGE@
Name: libcarddav
diff --git a/src/Makefile.am b/src/Makefile.am
index e76196a..9698bd8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@ libcarddav_la_SOURCES = \
lock-carddav-object.c \
lock-carddav-object.h
-libcarddav_includedir=$(includedir)/libcarddav-@VERSION@
+libcarddav_includedir=$(includedir)/libcarddav
libcarddav_include_HEADERS = carddav.h
noinst_HEADERS = \
diff --git a/src/Makefile.in b/src/Makefile.in
index 86782a2..0fe282b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -278,7 +278,7 @@ libcarddav_la_SOURCES = \
lock-carddav-object.c \
lock-carddav-object.h
-libcarddav_includedir = $(includedir)/libcarddav-@VERSION@
+libcarddav_includedir = $(includedir)/libcarddav
libcarddav_include_HEADERS = carddav.h
noinst_HEADERS = \
add-carddav-object.h \