Mercurial > hg > release > heapstats-2.0
changeset 186:fe7e9fae9d25
Bug 3266: 'make install' failed because the version in a directory path mismatch.
Summary: Change install source directories from fixed value to ${PACKAGE_VERSION}.
Contributed-by: Keisuke HANAMURA <k-hanamura@bit-isle.co.jp> @khanamura
Reviewed-by: yasuenag
https://github.com/HeapStats/heapstats/pull/67
| author | Yasumasa Suenaga <yasuenag@gmail.com> |
|---|---|
| date | Fri, 16 Dec 2016 22:41:14 +0900 |
| parents | 4c522061af03 |
| children | 11b4f3331a1a |
| files | ChangeLog Makefile.am Makefile.in |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Dec 13 12:20:11 2016 +0900 +++ b/ChangeLog Fri Dec 16 22:41:14 2016 +0900 @@ -1,3 +1,8 @@ +2016-12-16 Yasumasa Suenaga <yasuenag@gmail.com> + + * Bug 3266: 'make install' failed because the version in a directory path mismatch. + Contributed-by: Keisuke HANAMURA <k-hanamura@bit-isle.co.jp> @khanamura + 2016-12-13 Yasumasa Suenaga <yasuenag@gmail.com> * Bug 3262: Add IntelliJ IDEA support
--- a/Makefile.am Tue Dec 13 12:20:11 2016 +0900 +++ b/Makefile.am Fri Dec 16 22:41:14 2016 +0900 @@ -3,8 +3,8 @@ MVN = @MVN@ JAVA_HOME = @JDK_DIR@ -ANALYZER_DIR = $(srcdir)/analyzer/fx/target/heapstats-analyzer-2.0-bin/heapstats-analyzer-2.0 -CLI_DIR = $(srcdir)/analyzer/cli/target/heapstats-cli-2.0-bin/heapstats-cli-2.0 +ANALYZER_DIR = $(srcdir)/analyzer/fx/target/heapstats-analyzer-$(PACKAGE_VERSION)-bin/heapstats-analyzer-$(PACKAGE_VERSION) +CLI_DIR = $(srcdir)/analyzer/cli/target/heapstats-cli-$(PACKAGE_VERSION)-bin/heapstats-cli-$(PACKAGE_VERSION) .PHONY: $(SUBDIRS) analyzer
--- a/Makefile.in Tue Dec 13 12:20:11 2016 +0900 +++ b/Makefile.in Fri Dec 16 22:41:14 2016 +0900 @@ -322,8 +322,8 @@ ACLOCAL_AMFLAGS = -I ./m4 SUBDIRS = agent mbean JAVA_HOME = @JDK_DIR@ -ANALYZER_DIR = $(srcdir)/analyzer/fx/target/heapstats-analyzer-2.0-bin/heapstats-analyzer-2.0 -CLI_DIR = $(srcdir)/analyzer/cli/target/heapstats-cli-2.0-bin/heapstats-cli-2.0 +ANALYZER_DIR = $(srcdir)/analyzer/fx/target/heapstats-analyzer-$(PACKAGE_VERSION)-bin/heapstats-analyzer-$(PACKAGE_VERSION) +CLI_DIR = $(srcdir)/analyzer/cli/target/heapstats-cli-$(PACKAGE_VERSION)-bin/heapstats-cli-$(PACKAGE_VERSION) all: all-recursive .SUFFIXES: