From ea3ffb6a96d7d83e0e47447630c0f9dcf4d340c9 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Mon, 24 Jul 2006 17:13:01 +0100 Subject: [PATCH] Add a minor fix for pkgconfig. --- install.sh | 7 +++++-- skel/src/clib/pkgconf.in | 2 +- skel/src/cpplib/pkgconf.in | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index edd2a60..734eccf 100755 --- a/install.sh +++ b/install.sh @@ -37,6 +37,7 @@ PC="$1"; shift HEADER_NAME="$1"; shift DEST_DIR="${DEST_DIR}/${P}" +PMINUSL="-l$(echo ${P} | sed -e 's,^lib,,')" @@ -58,12 +59,14 @@ mv project.kdevelop.filelist ${P}.kdevelop.filelist # Build sed script echo "Changing variables..." -echo " Building script" +echo -n " Building script ( " SED_SCRIPT="script.sed" -for param in P PC HEADER_NAME +for param in P PC HEADER_NAME PMINUSL do echo "s,@${param}@,${!param},g" >> "${SED_SCRIPT}" + echo -n "${PARAM} " done +echo ")" # Create a list of all the files. echo " Building list of files" diff --git a/skel/src/clib/pkgconf.in b/skel/src/clib/pkgconf.in index 5862c6a..1c3ab6a 100644 --- a/skel/src/clib/pkgconf.in +++ b/skel/src/clib/pkgconf.in @@ -16,5 +16,5 @@ Version: @VERSION@ Requires: # Compilation information -Libs: -L@LIBDIR@ -l@P@ +Libs: -L@LIBDIR@ @PMINUSL@ Cflags: -I@INCLUDEDIR@ diff --git a/skel/src/cpplib/pkgconf.in b/skel/src/cpplib/pkgconf.in index c4c4cd3..db537cc 100644 --- a/skel/src/cpplib/pkgconf.in +++ b/skel/src/cpplib/pkgconf.in @@ -16,5 +16,5 @@ Version: @VERSION@ Requires: # Compilation information -Libs: -L@LIBDIR@ -l@P@ +Libs: -L@LIBDIR@ @PMINUSL@ Cflags: -I@INCLUDEDIR@