diff options
| author | Reimundo Heluani <rheluani@gmail.com> | 2010-12-21 12:25:22 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-12-21 12:26:23 +0000 |
| commit | 0c4e6e9f41b24bbb7ea33653b8a81ff79c0ea032 (patch) | |
| tree | 3ac04e6bb616fccfb757b3be7012854b0855c80b | |
| parent | 4f57c42179b681945727ae4d5d4d761a6a4363a3 (diff) | |
src: don't install _generated/errors.py twice
Fixes: fd.o#32526
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,6 +1,11 @@ telepathy-python 0.15.20 (UNRELEASED) ===================================== +Fixes: + + * fd.o#32526: telepathy-python fails to install with new autotools by + installing _generated/errors.py twice. (Reimundo Heluani) + telepathy-python 0.15.19 (2010-12-03) ===================================== diff --git a/src/Makefile.am b/src/Makefile.am index 135f2f0..ede1fc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,10 +13,12 @@ telepathy_PYTHON = \ spec_dir = $(top_srcdir)/spec spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)) +# We leave _generated/errors.py out of here because there exists a +# spec/errors.xml file, so that means there'll be a +# _generated/errors.py in $(spec_files). See fd.o#32526 BUILT_SOURCES = \ _generated/interfaces.py \ _generated/constants.py \ - _generated/errors.py \ _generated/__init__.py \ $(spec_files) |