Stop dist. protobuf headers by default.

FellowTraveler · Feb 28, 2014 · 9bde2d7 · 9bde2d7
1 parent 1bb9d55
commit 9bde2d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/INSTALL-MEMO-Linux.txt b/docs/INSTALL-MEMO-Linux.txt
@@ -109,7 +109,7 @@ $ git clone https://github.com/randy-waterhouse/opentxs.git
 $ cd opentxs
 $ ./autogen.sh
 $ ./configure
-$ sudo make distcheck
+$ make distcheck
 $ mv opentxs-0.90.c.tar.gz opentxs_0.90.c.orig.tar.gz
 $ tar xf opentxs_0.90.c.orig.tar.gz
 $ cd opentxs-0.90.c

diff --git a/src/otlib/otprotob/Makefile.am b/src/otlib/otprotob/Makefile.am
@@ -15,7 +15,7 @@ libotprotob_la_LDFLAGS  =   -static
 
 ## Protobuf headers and packaging
 
-otprotob_headers_dir    =   $(top_srcdir)/include/otlib
+otprotob_headers_dir    =   $(top_builddir)/include/otlib
 
 otprotob_headers        =   $(otprotob_headers_dir)/Bitcoin.pb.h       \
                             $(otprotob_headers_dir)/Generics.pb.h      \
@@ -24,7 +24,7 @@ otprotob_headers        =   $(otprotob_headers_dir)/Bitcoin.pb.h       \
 
 BUILT_SOURCES           =   $(otprotob_headers)
 
-pkginclude_HEADERS      =   $(otprotob_headers)
+nodist_pkginclude_HEADERS      =   $(otprotob_headers)
 
 
 ## Extra rules to handle *.proto as autobuild inputs
@@ -41,6 +41,6 @@ otprotob_build_dir      =   $(top_builddir)/src/otlib/otprotob
 	$(AM_V_at)$(am__mv) $(otprotob_build_dir)/$(*F).pb.cc $(otprotob_build_dir)/$(@F)
 	$(AM_V_at)$(am__mv) $(otprotob_build_dir)/$(*F).pb.h $(otprotob_headers_dir)/$(*F).pb.h
 
-CLEANFILES              =   $(otprotob_build_dir)/*.h      \
+DISTCLEANFILES              =   $(otprotob_build_dir)/*.h      \
                             $(otprotob_build_dir)/*.cc     \
                             $(otprotob_headers_dir)/*.pb.h