From d4478cdcd1f6aff97ee1e43012f394b4a8827729 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mtg@gnu.org>
Date: Tue, 22 Dec 2015 11:45:13 -0500
Subject: [PATCH] distcheck target fix

`make distcheck` now works as expected (does not fail).
---
 Makefile.am     | 31 ++++++++++++++++++-------------
 configure.ac    |  8 ++++----
 doc/Makefile.am | 12 ++++++++----
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c3cf013..c8d4d61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,11 +18,11 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-path_build = $(top_builddir)/build
-path_tools = $(top_builddir)/tools
-path_lib   = $(top_builddir)/lib
-path_test  = $(top_builddir)/test
-path_doc   = $(top_builddir)/doc
+path_build = $(srcdir)/build
+path_tools = $(srcdir)/tools
+path_lib   = $(srcdir)/lib
+path_test  = $(srcdir)/test
+path_doc   = $(srcdir)/doc
 
 path_combine_output      = $(path_build)/ease.js
 path_combine_output_full = $(path_build)/ease-full.js
@@ -34,8 +34,8 @@ path_combine_output_full_min = $(path_combine_output_full:.js=.min.js)
 src_js                = @SRC_JS@
 path_externs_internal = $(path_build)/externs-internal.js
 
-test_cases=$(shell cd test/ && find . -name '*Test.*' | tr '\n' ' ' | LC_ALL=C sort )
-src_tests=$(shell find test/ -name test-* | tr '\n' ' ' | LC_ALL=C sort )
+test_cases=$(shell cd $(path_test)/ && find . -name '*Test.*' | tr '\n' ' ' | LC_ALL=C sort )
+src_tests=$(shell find $(path_test)/ -name test-* | tr '\n' ' ' | LC_ALL=C sort )
 
 combine  = $(path_tools)/combine
 compiler = @CCJAR@
@@ -48,11 +48,16 @@ EXTRA_DIST = AUTHORS NEWS ChangeLog README.md HACKING INSTALL \
              $(path_combine_output) $(path_combine_output_full) \
              $(path_browser_test) $(path_combine_output_min) \
              $(path_combine_output_full_min) \
-             tools/combine tools/mkexterns tools/rmtrail \
-             tools/signchk tools/browser-test.html tools/combine-order.js \
-             tools/combine-test.tpl tools/combine.tpl tools/externs-global.js \
-             tools/externs.js tools/license-min.tpl tools/license.tpl \
-             tools/linechk-ignores tools/vergen
+             $(path_tools)/combine $(path_tools)/mkexterns \
+             $(path_tools)/rmtrail $(path_tools)/signchk \
+             $(path_tools)/browser-test.html $(path_tools)/combine-order.js \
+             $(path_tools)/combine-test.tpl $(path_tools)/combine.tpl \
+             $(path_tools)/externs-global.js $(path_tools)/externs.js \
+             $(path_tools)/license-min.tpl $(path_tools)/license.tpl \
+             $(path_tools)/linechk-ignores $(path_tools)/vergen \
+             $(path_tools)/gitlog-to-authors \
+             $(path_tools)/gitlog-to-changelog \
+             $(path_tools)/gitlog-to-news
 
 .PHONY: mkbuild combine min doc check test test-suite perf FORCE
 
@@ -91,7 +96,7 @@ if HAS_CCJAR
 	cat $(path_tools)/license-min.tpl > $@
 	$(JAVA) -jar $(compiler) \
 		--externs $(path_tools)/externs-global.js \
-		--externs $(path_build)/externs-internal.js \
+		--externs "$(path_externs_internal)" \
 		--language_in=ECMASCRIPT5_STRICT \
 		--js $< >> $@ || rm $@
 else
diff --git a/configure.ac b/configure.ac
index 52d0357..5dacabe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 ##
 
 # version string is dynamically generated
-m4_define([ver], m4_esyscmd(./tools/vergen))
+m4_define([ver], m4_esyscmd(tools/vergen))
 m4_if(ver, [], [m4_exit(1)])
 
 AC_INIT([easejs], [ver], [bug-easejs@gnu.org])
@@ -57,8 +57,8 @@ test "$NODE" || AC_MSG_WARN([
 # file includes exactly what is contained within the dir and is rebuilt if /any/
 # of the files change
 AC_MSG_CHECKING([for source js files])
-SRC_JS_LIB="$(find lib/*.js | tr '\n' ' ' | LC_ALL=C sort )"
-SRC_JS="index.js $SRC_JS_LIB"
+SRC_JS_LIB="$(find $srcdir/lib/*.js | tr '\n' ' ' | LC_ALL=C sort )"
+SRC_JS="$srcdir/index.js $SRC_JS_LIB"
 AC_SUBST(SRC_JS)
 if test -n "$SRC_JS_LIB"; then
     AC_MSG_RESULT(ok)
@@ -92,7 +92,7 @@ AM_CONDITIONAL(HAS_CCJAR, [test "$CCJAR"])
 
 # check for performance tests
 AC_MSG_CHECKING([for performance tests])
-PERF_TESTS=$( find test/perf -name 'perf-*.js' | tr '\n' ' ' | LC_ALL=C sort )
+PERF_TESTS=$( find $srcdir/test/perf -name 'perf-*.js' | tr '\n' ' ' | LC_ALL=C sort )
 AC_SUBST(PERF_TESTS)
 AS_IF([test "$PERF_TESTS"], [AC_MSG_RESULT(ok)], [AC_MSG_WARN(none found)])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 20629eb..e985d28 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -39,8 +39,9 @@ path_doc_css_ref=$(path_doc_css)
 
 MAKEINFOHTML=$(MAKEINFO) --html --css-ref="$(path_doc_css_ref)"
 
-doc_src := $(wildcard *.texi)
-doc_imgs := $(patsubst %.dia, %.png, $(wildcard $(path_doc_img)/*.dia))
+doc_src      := $(wildcard *.texi)
+doc_imgs     := $(patsubst %.dia, %.png, $(wildcard $(path_doc_img)/*.dia))
+doc_imgs_eps := $(patsubst %.dia, %.eps, $(wildcard $(path_doc_img)/*.dia))
 doc_imgs_txt := $(patsubst %.dia, %.png, $(wildcard $(path_doc_img)/*.txt))
 
 doc_replace := s/<\/body>/<script type="text\/javascript" \
@@ -63,6 +64,9 @@ img/%.png: img/%.dia
 		&& dia -e $@ -s x250 $< \
 		|| dia -e $@ -s 300x $<
 
+img/%.eps: img/%.dia
+	dia -e $@ $<
+
 # doc plain text
 $(path_doc_output_plain): $(doc_imgs_txt)
 	makeinfo --plain -I "." "${path_easejs_texi}" -o "$@"
@@ -98,7 +102,7 @@ $(path_doc_output_html)/%.css: %.css
 	cp $< $@
 
 
-img: $(doc_imgs)
+img: $(doc_imgs) $(doc_imgs_eps)
 
 plain: $(path_doc_output_plain)
 install-plain: plain
@@ -107,6 +111,6 @@ install-plain: plain
 		$(DESTDIR)$(docdir)/easejs.txt
 
 clean-local:
-	rm -rf $(path_doc_img)/*.png
+	rm -rf $(doc_imgs) $(doc_imgs_eps)
 	rm -f $(path_doc_output_plain)