Fix installation locations.

This partially resolves bug report 701.
13 years ago · 03705c2239
parent 9008b7a48f
commit 03705c2239
3 changed files with 3 additions and 3 deletions
--- 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
--- 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 = \
--- 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 \