aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorThomas Hisch <t.hisch@gmail.com>2018-04-09 21:43:10 +0200
committerJie Luo <anandolee@gmail.com>2018-04-09 12:43:10 -0700
commit451e0446abc40f46b5941c3feedb111e920c9959 (patch)
tree836e5a8f428cefd6c818404cf659520783eb82f6 /Makefile.am
parent3b6d027ba250c96ac1c5e3c0a1de0b1570d7bba1 (diff)
downloadprotobuf-451e0446abc40f46b5941c3feedb111e920c9959.tar.gz
protobuf-451e0446abc40f46b5941c3feedb111e920c9959.tar.bz2
protobuf-451e0446abc40f46b5941c3feedb111e920c9959.zip
Add __init__.py files to compiler and util subpackages (#4117)
The compiler and util subpackages are created by the build_py class in setup.py. This has caused an issue in the protobuf package in conda-forge (https://github.com/conda-forge/protobuf-feedstock/issues/40), which is fixed by this commit.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 23c5cffe..da371c67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -763,6 +763,7 @@ python_EXTRA_DIST= \
python/MANIFEST.in \
python/google/__init__.py \
python/google/protobuf/__init__.py \
+ python/google/protobuf/compiler/__init__.py \
python/google/protobuf/descriptor.py \
python/google/protobuf/descriptor_database.py \
python/google/protobuf/descriptor_pool.py \
@@ -858,6 +859,7 @@ python_EXTRA_DIST= \
python/google/protobuf/symbol_database.py \
python/google/protobuf/text_encoding.py \
python/google/protobuf/text_format.py \
+ python/google/protobuf/util/__init__.py \
python/release.sh \
python/mox.py \
python/setup.cfg \