Changeset View
Changeset View
Standalone View
Standalone View
head/databases/opentsdb/files/patch-Makefile.in
| --- Makefile.in.orig 2015-09-12 19:49:17 UTC | --- Makefile.in.orig 2015-09-12 19:49:17 UTC | ||||
| +++ Makefile.in | +++ Makefile.in | ||||
| @@ -1415,7 +1415,7 @@ printdeps: | @@ -1415,7 +1415,7 @@ printdeps: | ||||
| # This is kind of a hack, but I couldn't find a better way to adjust the paths | # 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... | # in the script before it gets installed... | ||||
| install-exec-hook: | install-exec-hook: | ||||
| - script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(pkgdatadir)/etc/opentsdb'; \ | - script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(pkgdatadir)/etc/opentsdb'; \ | ||||
| + script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='/usr/local/etc/opentsdb'; \ | + script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/etc/opentsdb'; \ | ||||
| abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script) | abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script) | ||||
| cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb" | cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb" | ||||
| rm -f tsdb.tmp | rm -f tsdb.tmp | ||||
| @@ -1442,7 +1442,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" "$@" | |||||
| gwtdev: .gwtc-stamp | |||||
| @@ -1468,7 +1468,7 @@ gwttsd: staticroot | @@ -1468,7 +1468,7 @@ gwttsd: staticroot | ||||
| # how to tell it to install a bunch of files recursively for which I don't | # how to tell it to install a bunch of files recursively for which I don't | ||||
| # know ahead of time what the file names are. | # know ahead of time what the file names are. | ||||
| install-data-local: staticroot install-data-lib install-data-tools \ | install-data-local: staticroot install-data-lib install-data-tools \ | ||||
| - install-data-bin install-data-etc | - install-data-bin install-data-etc | ||||
| + install-data-bin | + install-data-bin | ||||
| @$(NORMAL_INSTALL) | @$(NORMAL_INSTALL) | ||||
| test -z "$(staticdir)" || $(mkdir_p) "$(DESTDIR)$(staticdir)" | test -z "$(staticdir)" || $(mkdir_p) "$(DESTDIR)$(staticdir)" | ||||
| @set -e; pwd; ls -lFh; cd "$(DEV_TSD_STATICROOT)"; \ | @set -e; pwd; ls -lFh; cd "$(DEV_TSD_STATICROOT)"; \ | ||||