summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-03-21 20:49:54 -0500
committerDarrell Anderson <[email protected]>2012-03-21 20:49:54 -0500
commit03705c223966657a6cca466fc96188a2b1621c39 (patch)
treef8be6b65f6842a7205adc747a85fbc69b0aa105d
parent9008b7a48fc0ecefe9385a7e16ba320e673b7c1c (diff)
downloadlibcaldav-03705c223966657a6cca466fc96188a2b1621c39.tar.gz
libcaldav-03705c223966657a6cca466fc96188a2b1621c39.zip
Fix installation locations.
This partially resolves bug report 701.
-rw-r--r--libcaldav.pc.in2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/libcaldav.pc.in b/libcaldav.pc.in
index 8ea9c6b..7bdbda3 100644
--- a/libcaldav.pc.in
+++ b/libcaldav.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-pkglibdir=${libdir}/@PACKAGE@
+pkglibdir=${libdir}
pkgincludedir=${includedir}/@PACKAGE@
Name: libcaldav
diff --git a/src/Makefile.am b/src/Makefile.am
index 59d3126..5c22f6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,7 +37,7 @@ libcaldav_la_SOURCES = \
get-freebusy-report.c \
get-freebusy-report.h
-libcaldav_includedir=$(includedir)/libcaldav-@VERSION@
+libcaldav_includedir=$(includedir)/libcaldav
libcaldav_include_HEADERS = caldav.h
noinst_HEADERS = \
diff --git a/src/Makefile.in b/src/Makefile.in
index 5803fc2..499f247 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -284,7 +284,7 @@ libcaldav_la_SOURCES = \
get-freebusy-report.c \
get-freebusy-report.h
-libcaldav_includedir = $(includedir)/libcaldav-@VERSION@
+libcaldav_includedir = $(includedir)/libcaldav
libcaldav_include_HEADERS = caldav.h
noinst_HEADERS = \
add-caldav-object.h \