diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-04-28 09:54:46 -0700 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2010-04-29 17:50:25 +0200 |
| commit | 3cf6e8d5a301af2a772d0a3e0b4cc8aa24a1cf25 (patch) | |
| tree | 52446e8213dc712c89bce62e11cb13cf5a56c698 /vapigen/vala-gen-introspect | |
| parent | 4b198ff5a8bf797a0971dfe3e4539d05a6a5f446 (diff) | |
| download | vala-3cf6e8d5a301af2a772d0a3e0b4cc8aa24a1cf25.tar.gz | |
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.
Diffstat (limited to 'vapigen/vala-gen-introspect')
| -rwxr-xr-x | 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 ecf3dffa2..538f43d98 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 |