From a5dec9ad6af9e5eeb9162890ba522e47a24fcd5d Mon Sep 17 00:00:00 2001 From: Giovanni Campagna <<gcampagna@src.gnome.org>> Date: Sat, 5 Jan 2013 18:29:46 +0100 Subject: [PATCH] Fix srcdir != builddir By updating libgd to a newer, fixed, version, and by noting that --vapidirs in VALAFLAGS are relative to srcdir, not builddir (automake inserts a cd $(srcdir) before calling vala) https://bugzilla.gnome.org/show_bug.cgi?id=691504 --- libgd | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libgd b/libgd index f63cab2..680a9f7 160000 --- a/libgd +++ b/libgd @@ -1 +1 @@ -Subproject commit f63cab25ce05bd3bc83ef9e389b299f96339f7fe +Subproject commit 680a9f72a0c3019cf4013ed026270ee7b9f1abc9 diff --git a/src/Makefile.am b/src/Makefile.am index d63d064..eac3553 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = \ $(NULL) AM_VALAFLAGS = \ - --vapidir=$(srcdir)/../vapi --vapidir=$(srcdir)/listbox --vapidir=$(top_srcdir)/libgd --pkg config --pkg custom --pkg egglistbox --pkg gd-1.0 \ + --vapidir=../vapi --vapidir=listbox --vapidir=../libgd --pkg config --pkg custom --pkg egglistbox --pkg gd-1.0 \ @CONTACTS_PACKAGES@ \ $(NULL)