From db8dbbf3719bd479adc12481dc540b88be9e6255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Fri, 4 Aug 2017 11:59:14 +0200 Subject: [PATCH 1/2] Fix 'make dist' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EXTRA_DIST copies the listed directories/files from the _source_ directory into the distribution. Since the doc directory does not exist after running autogen + configure + make dist, the distribution tarball generation fails. Note that the dist-hook rule below operates on 'distdir', not on the source directory where EXTRA_DIST expects the existence of the doc folder. In summary, even if I removed 'doc' from EXTRA_DIST, the dist tarball will always contain the documentation (due to the dist-hook rule). Signed-off-by: László Várady --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 8728ff0..cce39a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = README.md README.html README-WIN32.html EXTRA_DIST += config.h.win32 json-c.vcproj json-c.vcxproj json-c.vcxproj.filters -EXTRA_DIST += Doxyfile doc +EXTRA_DIST += Doxyfile dist-hook: test -d "$(distdir)/doc" || mkdir "$(distdir)/doc" From e0e34f0a13c581d0e7527a2ce7dcb9cc8b6e403f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Fri, 4 Aug 2017 12:26:54 +0200 Subject: [PATCH 2/2] Fix 'make distcheck' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index cce39a0..bb4fb6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,8 @@ libjson_cinclude_HEADERS = \ strdup_compat.h \ vasprintf_compat.h \ printbuf.h \ - random_seed.h + random_seed.h \ + strerror_override.h libjson_c_la_LDFLAGS = -version-info 3:0:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@ @@ -52,7 +53,8 @@ libjson_c_la_SOURCES = \ linkhash.c \ printbuf.c \ random_seed.c \ - strerror_override.c + strerror_override.c \ + strerror_override_private.h distclean-local: -rm -rf $(testsubdir)