[vala] vala-gen-introspect: Support packages without prefix
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] vala-gen-introspect: Support packages without prefix
- Date: Thu, 29 Apr 2010 15:50:47 +0000 (UTC)
commit 3cf6e8d5a301af2a772d0a3e0b4cc8aa24a1cf25
Author: Travis Reitter <travis reitter collabora co uk>
Date: Wed Apr 28 09:54:46 2010 -0700
vala-gen-introspect: Support packages without prefix
Uninstalled packages may use an empty string as prefix. Do not ignore
valid header files when PREFIX is an empty string and the header path
starts with a dot.
Fixes bug 615119.
vapigen/vala-gen-introspect/vala-gen-introspect.in | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/vapigen/vala-gen-introspect/vala-gen-introspect.in b/vapigen/vala-gen-introspect/vala-gen-introspect.in
index ecf3dff..538f43d 100755
--- a/vapigen/vala-gen-introspect/vala-gen-introspect.in
+++ b/vapigen/vala-gen-introspect/vala-gen-introspect.in
@@ -16,8 +16,14 @@ PKGBASE=$2/$1
PKGPREFIX=`pkg-config --variable=prefix $PKGNAME`
PKGFILES=`cat $PKGBASE.files | grep ^[/.]`
+
+# This is to avoid adding a leading / in case the prefix is ""
+if [ "x$PKGPREFIX" != "x" ]; then
+ PKGPREFIXPLUSDELIMIT="$PKGPREFIX/"
+fi
+
PKGFILES="${PKGFILES}\
- `cat $PKGBASE.files | grep ^[a-zA-Z] | sed -e "s ^@$PKGPREFIX/@"`"
+ `cat $PKGBASE.files | grep ^[a-zA-Z.] | sed -e "s ^@$PKGPREFIXPLUSDELIMIT@"`"
if [ -e $PKGBASE.excludes ]
then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]