diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-07-26 12:35:12 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-07-26 12:35:16 +0100 |
| commit | 2887e0a49d80dde7bcb9d8a150a2a168eea0a703 (patch) | |
| tree | 7ee1fbfb2cd75a1514f24936a6408f6dcc140254 | |
| parent | 76e518ffe1d0fec9a7a1c36a9bebaa8e35f04a02 (diff) | |
| parent | 96a893e5c22db626ba6607e1bd4138a19ffb50f5 (diff) | |
Merge remote branch 'treitter/vala-packaging1'
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | vala/Makefile.am | 2 | ||||
| -rw-r--r-- | vala/telepathy-vala.pc.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vala/Makefile.am b/vala/Makefile.am index 35aae1e65..6914909ab 100644 --- a/vala/Makefile.am +++ b/vala/Makefile.am @@ -1,4 +1,4 @@ -vapidir = $(datarootdir)/telepathy/vapi +vapidir = $(datarootdir)/vala/vapi vapi_DATA = \ telepathy-glib.vapi \ telepathy-glib.deps \ diff --git a/vala/telepathy-vala.pc.in b/vala/telepathy-vala.pc.in index fdb4316c2..61ccb9dce 100644 --- a/vala/telepathy-vala.pc.in +++ b/vala/telepathy-vala.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ datarootdir=@datarootdir@ datadir=@datadir@ -vapidir=@datadir@/telepathy/vapi -valaflags=--vapidir=${vapidir} +vapidir=@datadir@/vala/vapi +valaflags= Name: Telepathy Vala bindings Description: Vala bindings for the Telepathy framework |