From fd9474fd52cecf326904f9bae523b75b0c3645c7 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 21 Mar 2012 20:52:28 -0500 Subject: Fix installation locations. This partially resolves bug report 701. --- libcarddav.pc.in | 2 +- src/Makefile.am | 2 +- src/Makefile.in | 2 +- 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 \ -- cgit v1.2.3