Repository: incubator-hawq Updated Branches: refs/heads/master f1fb48379 -> 4fbe8e2dd
HAWQ-1041. Some "top_srcdir" should be "top_builddir" in makefiles of libhdfs3 and libyarn. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/4fbe8e2d Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/4fbe8e2d Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/4fbe8e2d Branch: refs/heads/master Commit: 4fbe8e2dd65258cb3ce93e0183824a10bc5ccd18 Parents: f1fb483 Author: Paul Guo <[email protected]> Authored: Wed Sep 7 18:12:29 2016 +0800 Committer: ivan <[email protected]> Committed: Tue Sep 13 09:53:41 2016 +0800 ---------------------------------------------------------------------- depends/libhdfs3/Makefile | 16 ++++++++-------- depends/libyarn/Makefile | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4fbe8e2d/depends/libhdfs3/Makefile ---------------------------------------------------------------------- diff --git a/depends/libhdfs3/Makefile b/depends/libhdfs3/Makefile index 3580229..28d405d 100644 --- a/depends/libhdfs3/Makefile +++ b/depends/libhdfs3/Makefile @@ -39,30 +39,30 @@ endif # enable_coverage ifeq ($(with_libhdfs3), yes) -# Hack: For the target "all", we will install them temporarily under build/install to compile hawq +# We will need to install it temporarily under build/install for hawq building. all: build - cd $(top_srcdir)/$(subdir)/build; mkdir -p install; \ + cd $(top_builddir)/$(subdir)/build; mkdir -p install; \ $(MAKE) DESTDIR=$(abs_top_builddir)/$(subdir)/build/install install install: build - cd $(top_srcdir)/$(subdir)/build && $(MAKE) install + cd $(top_builddir)/$(subdir)/build && $(MAKE) install distclean: - rm -rf $(top_srcdir)/$(subdir)/build + rm -rf $(top_builddir)/$(subdir)/build maintainer-clean: distclean clean: - if [ -d $(top_srcdir)/$(subdir)/build ]; then \ - cd $(top_srcdir)/$(subdir)/build && $(MAKE) clean && rm -f build.timestamp; \ + if [ -d $(top_builddir)/$(subdir)/build ]; then \ + cd $(top_builddir)/$(subdir)/build && $(MAKE) clean && rm -f build.timestamp; \ fi build: pre-config - cd $(top_srcdir)/$(subdir)/build && $(MAKE) + cd $(top_builddir)/$(subdir)/build && $(MAKE) # trigger bootstrap only once. pre-config: - cd $(top_srcdir)/$(subdir)/; \ + cd $(top_builddir)/$(subdir)/; \ mkdir -p build; \ cd build; \ if [ ! -f build.timestamp ]; then \ http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4fbe8e2d/depends/libyarn/Makefile ---------------------------------------------------------------------- diff --git a/depends/libyarn/Makefile b/depends/libyarn/Makefile index 44c97cb..0a20476 100644 --- a/depends/libyarn/Makefile +++ b/depends/libyarn/Makefile @@ -39,30 +39,30 @@ endif # enable_coverage ifeq ($(with_libyarn), yes) -# Hack: For the target "all", we will install them temporarily under build/install to compile hawq +# We will need to install it temporarily under build/install for hawq building. all: build - cd $(top_srcdir)/$(subdir)/build; mkdir -p install; \ + cd $(top_builddir)/$(subdir)/build; mkdir -p install; \ $(MAKE) DESTDIR=$(abs_top_builddir)/$(subdir)/build/install install install: build - cd $(top_srcdir)/$(subdir)/build && $(MAKE) install + cd $(top_builddir)/$(subdir)/build && $(MAKE) install distclean: - rm -rf $(top_srcdir)/$(subdir)/build + rm -rf $(top_builddir)/$(subdir)/build maintainer-clean: distclean clean: - if [ -d $(top_srcdir)/$(subdir)/build ]; then \ - cd $(top_srcdir)/$(subdir)/build && $(MAKE) clean && rm -f build.timestamp; \ + if [ -d $(top_builddir)/$(subdir)/build ]; then \ + cd $(top_builddir)/$(subdir)/build && $(MAKE) clean && rm -f build.timestamp; \ fi build: pre-config - cd $(top_srcdir)/$(subdir)/build && $(MAKE) + cd $(top_builddir)/$(subdir)/build && $(MAKE) # trigger bootstrap only once. pre-config: - cd $(top_srcdir)/$(subdir)/; \ + cd $(top_builddir)/$(subdir)/; \ mkdir -p build; \ cd build; \ if [ ! -f build.timestamp ]; then \
