Allow Empathy to be built from outside the source tree.

Patch by  Theppitak Karoonboonyanan, fix bug #570080.

svn path=/trunk/; revision=2372

diff --git a/data/Makefile.am b/data/Makefile.am
index b4cb549bc56073b303654dd888299977d44c945c..319d86e6145ae4ab2c68747146244a737a7f0046 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -33,7 +33,7 @@ if GCONF_SCHEMAS_INSTALL
 install-data-local:
        if test -z "$(DESTDIR)" ; then \
          for p in $(schemas_DATA) ; do \
-           GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+           GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(builddir)/$$p ; \
          done \
        fi
 else

diff --git a/python/pyempathy/Makefile.am b/python/pyempathy/Makefile.am
index a7efea3671954e3c9b3ab3af2f0d5edbcb5be6fc..fa973bf0375f4f57e0bc558ccb8f596c23f4029d 100644 (file)
--- a/python/pyempathy/Makefile.am
+++ b/python/pyempathy/Makefile.am
@@ -3,6 +3,7 @@ PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`
 AM_CPPFLAGS =                                           \
        -I.                                             \
        -I$(top_srcdir)/libempathy                      \
+       -I$(top_builddir)/libempathy                    \
        -I$(top_srcdir)                                 \
        -DDATADIR=\""$(datadir)"\"                      \
        $(PYTHON_BINDING_CFLAGS)                        \
@@ -16,7 +17,9 @@ pyempathydir = $(pyexecdir)
 pyempathy_LTLIBRARIES = empathy.la
 
 empathy_la_SOURCES =                                   \
-       pyempathymodule.c                               \
+       pyempathymodule.c
+
+nodist_empathy_la_SOURCES =                            \
        pyempathy.c
 
 empathy_la_LIBADD =                                    \
@@ -31,8 +34,8 @@ pyempathy.c: pyempathy.override pyempathy.defs
                --prefix empathy                        \
                --register $(PYDEFS)/gdk-types.defs     \
                --register $(PYDEFS)/gtk-types.defs     \
-               --override pyempathy.override           \
-               pyempathy.defs > $@ 
+               --override $(srcdir)/pyempathy.override \
+               $(srcdir)/pyempathy.defs > $@ 
 
 EXTRA_DIST =                   \
        pyempathy.override      \

diff --git a/python/pyempathygtk/Makefile.am b/python/pyempathygtk/Makefile.am
index d44e1f4ab1c74cb731f65be510bb8ce8eb6929fd..ba0ee11dfde11232a9a032cbe6a9d268c51909c2 100644 (file)
--- a/python/pyempathygtk/Makefile.am
+++ b/python/pyempathygtk/Makefile.am
@@ -3,6 +3,7 @@ PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`
 AM_CPPFLAGS =                                           \
        -I.                                             \
        -I$(top_srcdir)/libempathy-gtk                  \
+       -I$(top_builddir)/libempathy-gtk                \
        -I$(top_srcdir)                                 \
        -DDATADIR=\""$(datadir)"\"                      \
        $(PYTHON_BINDING_CFLAGS)                        \
@@ -15,7 +16,9 @@ pyempathygtkdir = $(pyexecdir)
 pyempathygtk_LTLIBRARIES = empathygtk.la
 
 empathygtk_la_SOURCES =                                        \
-       pyempathygtkmodule.c                            \
+       pyempathygtkmodule.c
+
+nodist_empathygtk_la_SOURCES =                         \
        pyempathygtk.c
 
 empathygtk_la_LIBADD =                                 \
@@ -31,9 +34,9 @@ pyempathygtk.c: pyempathygtk.override pyempathygtk.defs
                --prefix empathy                                        \
                --register $(PYDEFS)/gdk-types.defs                     \
                --register $(PYDEFS)/gtk-types.defs                     \
-               --register ../pyempathy/pyempathy.defs                  \
-               --override pyempathygtk.override                        \
-               pyempathygtk.defs > $@ 
+               --register $(srcdir)/../pyempathy/pyempathy.defs        \
+               --override $(srcdir)/pyempathygtk.override              \
+               $(srcdir)/pyempathygtk.defs > $@ 
 
 EXTRA_DIST =                   \
        pyempathygtk.override   \