The symbolic of static content should use relative path (#349)

chaotian · manolama · commit 5b987f9c4fb6 · 2018-12-10T18:36:54.000-08:00
* Update Makefile.am

The symbolic of static content should use relative path

*  Set the abs_srcdir and abs_builddir in runtime instead of compiling time

Signed-off-by: Chris Larsen &lt;clarsen@yahoo-inc.com&gt;
diff --git a/Makefile.am b/Makefile.am
@@ -548,7 +548,7 @@ gwttsd: staticroot
 	$(mkdir_p) $(DEV_TSD_STATICROOT)
 	cp $(dist_static_DATA:%=$(srcdir)/%) $(DEV_TSD_STATICROOT)
 	find -L $(DEV_TSD_STATICROOT) -type l -exec rm {} \;
-	p=`pwd`/gwt/queryui && cd $(DEV_TSD_STATICROOT) \
+	p=../gwt/queryui && cd $(DEV_TSD_STATICROOT) \
 	  && for i in $$p/*; do ln -s -f "$$i" || break; done
 	find -L $(DEV_TSD_STATICROOT)/gwt -type f | xargs touch
 	@touch .staticroot-stamp
diff --git a/tsdb.in b/tsdb.in
@@ -6,8 +6,8 @@ mydir=`dirname "$0"`
 # Either:
 #  abs_srcdir and abs_builddir are set: we're running in a dev tree
 #  or pkgdatadir is set: we've been installed, we respect that.
-abs_srcdir='@abs_srcdir@'
-abs_builddir='@abs_builddir@'
+abs_srcdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.."
+abs_builddir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 pkgdatadir='@pkgdatadir@'
 configdir='@configdir@'
 # Either we've been installed and pkgdatadir exists, or we haven't been
