From: László Várady <laszlo.varady@balabit.com>
Date: Fri, 4 Aug 2017 09:59:14 +0000 (+0200)
Subject: Fix 'make dist'
X-Git-Tag: json-c-0.13-20171207~64^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db8dbbf3719bd479adc12481dc540b88be9e6255;p=thirdparty%2Fjson-c.git

Fix 'make dist'

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 <laszlo.varady@balabit.com>
---

diff --git a/Makefile.am b/Makefile.am
index 8728ff0e..cce39a0b 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"