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 6c2f8b9b47ee742a8bea76d054d4afef1a4eaa65..97d8956691c5302408d2fab65b2ce7f8d01722a5 100755 (executable)
--- 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 ed8a32de8e6ad6894e4080d36325e7a09a625c44..6d14cbe419f278fb0917ff8fa71eac2528e31dad 100644 (file)
--- 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 61ccfeda749f10af91c205b79c86e36832182a0b..3bf4c2e3dab8ce14ace77014f0f68a51fc7716e1 100644 (file)
--- 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 99a5f6bc5904b182e573a7c71f47e95c0c1fec3e..745f0313f20d12be4c11668c6b15bb0de7a45852 100644 (file)
--- 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}