Fix installation locations.

This partially resolves bug report 701.
12 years ago · fd9474fd52
parent 993b42cfe2
commit fd9474fd52
3 changed files with 3 additions and 3 deletions
--- 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
--- 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 = \
--- 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 \