From 37b1705f64db6a800b7c5a76d80290b3d8d942bd Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Mon, 9 Nov 2015 20:36:05 +0200 Subject: [PATCH] Fix staging and build on FreeBSD Make sure that the filesystem outside of DESTDIR isn't touched, hence set java.util.prefs.userRoot to $(HOME) and make sure etc/ config files go to $(sysconfdir)/etc/opentsdb instead of $(pkgdatadir)/etc/opentsdb. Signed-off-by: Chris Larsen --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7c9e486d90..0f299fd7e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -354,7 +354,7 @@ printdeps: # This is kind of a hack, but I couldn't find a better way to adjust the paths # in the script before it gets installed... install-exec-hook: - script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(pkgdatadir)/etc/opentsdb'; \ + script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfigdir)/etc/opentsdb'; \ abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script) cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb" rm -f tsdb.tmp @@ -411,7 +411,7 @@ gwtc: .gwtc-stamp @$(mkdir_p) gwt { cd $(srcdir) && cat $(httpui_SRC); } | $(MD5) >"$@-t" cmp -s "$@" "$@-t" && exit 0; \ - $(JAVA) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \ + $(JAVA) -Djava.util.prefs.userRoot=$(HOME) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \ $(GWTC_ARGS) -war gwt tsd.QueryUi @mv "$@-t" "$@"