aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/Makefile.am2
-rw-r--r--python/pyempathy/Makefile.am9
-rw-r--r--python/pyempathygtk/Makefile.am11
3 files changed, 14 insertions, 8 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index b4cb549bc..319d86e61 100644
--- 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 a7efea367..fa973bf03 100644
--- 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 d44e1f4ab..ba0ee11df 100644
--- 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 \