[seahorse] common: Work around vala srcdir != builddir from git issues



commit a8ab0f066d1b145fa383501ec857cdfdeaac93f5
Author: Colin Walters <walters verbum org>
Date:   Sun Nov 17 09:52:28 2013 -0500

    common: Work around vala srcdir != builddir from git issues
    
    gnome-continuous uses srcdir != builddir *from git*.  This differs
    from tarballs where generated source lives in $(srcdir).
    
    Anyways, vala's AM_PROG_VALAC generates some makefile rules that do
    "cd $(srcdir) && valac ...".
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=694153
    
    The problem is this actively breaks the $(srcdir) and $(builddir)
    automake macros when doing srcdir != builddir from git.
    
    We can work around it this way.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=712538

 common/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index a831521..38a7a1e 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -31,11 +31,11 @@ libcommon_la_SOURCES = \
 AM_VALAFLAGS = \
        $(VALA_FLAGS) \
        --use-header \
-       --header=seahorse-internal.h \
+       --header=$(abs_builddir)/seahorse-internal.h \
+       --vapidir=$(abs_srcdir) \
        --pkg gtk+-3.0 \
        --pkg gcr-3 \
        --pkg config \
-       --vapidir=$(srcdir) \
        --vapi=common.vapi \
        $(NULL)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]