# HG changeset patch
# User Yasumasa Suenaga <yasuenag@gmail.com>
# Date 1523192587 -32400
# Node ID 75a0eaeee66604ad7a69769520bd6a69f2b96404
# Parent  ef2b74a8df08da218859801fe7f66c36aff1d38b
Bug 3571: Build process of HeapStats attacher should regard the value detected by configure
Reviewed-by: ykubota
https://github.com/HeapStats/heapstats/pull/140

diff -r ef2b74a8df08 -r 75a0eaeee666 ChangeLog
--- a/ChangeLog	Sun Apr 08 21:59:37 2018 +0900
+++ b/ChangeLog	Sun Apr 08 22:03:07 2018 +0900
@@ -1,6 +1,7 @@
 2018-04-08 Yasumasa Suenaga <yasuenag@gmail.com>
 
 	* Bug 3570: Build warning on Arm box
+	* Bug 3571: Build process of HeapStats attacher should regard the value detected by configure
 
 2018-04-03 Yasumasa Suenaga <yasuenag@gmail.com>
 
diff -r ef2b74a8df08 -r 75a0eaeee666 agent/attacher/Makefile.am
--- a/agent/attacher/Makefile.am	Sun Apr 08 21:59:37 2018 +0900
+++ b/agent/attacher/Makefile.am	Sun Apr 08 22:03:07 2018 +0900
@@ -7,7 +7,7 @@
 	env JAVA_HOME=$(JDK_HOME) bash -c $(ANT)
 
 clean-local:
-	$(ANT) clean
+	env JAVA_HOME=$(JDK_HOME) bash -c "$(ANT) clean"
 
 install-exec-local:
 	$(mkdir_p) $(DESTDIR)/$(bindir)
diff -r ef2b74a8df08 -r 75a0eaeee666 agent/attacher/Makefile.in
--- a/agent/attacher/Makefile.in	Sun Apr 08 21:59:37 2018 +0900
+++ b/agent/attacher/Makefile.in	Sun Apr 08 22:03:07 2018 +0900
@@ -429,7 +429,7 @@
 	env JAVA_HOME=$(JDK_HOME) bash -c $(ANT)
 
 clean-local:
-	$(ANT) clean
+	env JAVA_HOME=$(JDK_HOME) bash -c "$(ANT) clean"
 
 install-exec-local:
 	$(mkdir_p) $(DESTDIR)/$(bindir)
diff -r ef2b74a8df08 -r 75a0eaeee666 agent/src/iotracer/Makefile.am
--- a/agent/src/iotracer/Makefile.am	Sun Apr 08 21:59:37 2018 +0900
+++ b/agent/src/iotracer/Makefile.am	Sun Apr 08 22:03:07 2018 +0900
@@ -1,8 +1,10 @@
+JDK_HOME = @JDK_DIR@
+
 all:
-	$(ANT) all
+	env JAVA_HOME=$(JDK_HOME) bash -c "$(ANT) all"
  
 clean-local:
-	$(ANT) clean
+	env JAVA_HOME=$(JDK_HOME) bash -c "$(ANT) clean"
  
 install-exec-local:
 	$(mkdir_p) $(DESTDIR)/$(sysconfdir)/iotracer
diff -r ef2b74a8df08 -r 75a0eaeee666 agent/src/iotracer/Makefile.in
--- a/agent/src/iotracer/Makefile.in	Sun Apr 08 21:59:37 2018 +0900
+++ b/agent/src/iotracer/Makefile.in	Sun Apr 08 22:03:07 2018 +0900
@@ -234,6 +234,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+JDK_HOME = @JDK_DIR@
 all: all-am
 
 .SUFFIXES:
@@ -419,11 +420,12 @@
 
 .PRECIOUS: Makefile
 
+
 all:
-	$(ANT) all
+	env JAVA_HOME=$(JDK_HOME) bash -c "$(ANT) all"
 
 clean-local:
-	$(ANT) clean
+	env JAVA_HOME=$(JDK_HOME) bash -c "$(ANT) clean"
 
 install-exec-local:
 	$(mkdir_p) $(DESTDIR)/$(sysconfdir)/iotracer