From: Martin Mares <mj@ucw.cz>
Date: Tue, 17 Jul 2007 18:07:26 +0000 (+0200)
Subject: First bits of installation of .pc files.
X-Git-Tag: holmes-import~506^2~50
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=08ec58075cd87236ea502c2c3b89e38126478167;p=libucw.git

First bits of installation of .pc files.

(So far, the paths are relative, so they are of doubtful use, but
the main bits are here.)
---

diff --git a/build/lib-flags b/build/lib-flags
index 6c2f8b9b..97d89566 100755
--- a/build/lib-flags
+++ b/build/lib-flags
@@ -20,5 +20,5 @@ while [ -n "$1" ] ; do
 done
 if [ -n "$PC" ] ; then
 	echo -n " "
-	PKG_CONFIG_PATH="$PKG_CONFIG_PATH:obj/pkg-config" pkg-config --libs $PC
+	PKG_CONFIG_PATH="$PKG_CONFIG_PATH:obj/pkgconfig" pkg-config --libs $PC
 fi
diff --git a/charset/libcharset.pc b/charset/libcharset.pc
index ed8a32de..6d14cbe4 100644
--- a/charset/libcharset.pc
+++ b/charset/libcharset.pc
@@ -1,7 +1,11 @@
 # pkg-config metadata for libcharset
 
+libdir=@LIBDIR@
+incdir=.
+
 Name: libcharset
 Description: Character set conversion library
 Version: @SHERLOCK_VERSION@
-Libs: -Lobj/charset -lcharset
+Cflags: -I${incdir}
+Libs: -L${libdir} -lcharset
 Requires: @DEPS@
diff --git a/images/libimages.pc b/images/libimages.pc
index 61ccfeda..3bf4c2e3 100644
--- a/images/libimages.pc
+++ b/images/libimages.pc
@@ -1,7 +1,11 @@
 # pkg-config metadata for libimages
 
+libdir=@LIBDIR@
+incdir=.
+
 Name: libimages
 Description: Sherlock image library
 Version: @SHERLOCK_VERSION@
-Libs: -Lobj/images -limages -lm -lpthread @LIBIMAGES_LIBS@
+Cflags: -I${incdir}
+Libs: -L${libdir} -limages -lm -lpthread @LIBIMAGES_LIBS@
 Requires: @DEPS@
diff --git a/lib/libucw.pc b/lib/libucw.pc
index 99a5f6bc..745f0313 100644
--- a/lib/libucw.pc
+++ b/lib/libucw.pc
@@ -1,5 +1,8 @@
 # pkg-config metadata for libucw
 
+libdir=@LIBDIR@
+incdir=.
+
 #ifdef CONFIG_UCW_THREADS
 threads=-lpthread
 #else
@@ -9,4 +12,5 @@ threads=
 Name: libucw
 Description: A library of utility functions and data structures
 Version: @SHERLOCK_VERSION@
-Libs: -Lobj/lib -lucw ${threads}
+Cflags: -I${incdir}
+Libs: -L${libdir} -lucw ${threads}