Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small cleanup in Makefile #4369

Merged
merged 1 commit into from May 22, 2017

Conversation

Projects
None yet
4 participants
@lukebakken
Copy link
Contributor

commented May 22, 2017

Standardize on parens in Makefile, use CURDIR rather than $(shell pwd)

@elasticmachine

This comment has been minimized.

Copy link
Collaborator

commented May 22, 2017

Can one of the admins verify this patch?

@elasticmachine

This comment has been minimized.

Copy link
Collaborator

commented May 22, 2017

Jenkins standing by to test this. If you aren't a maintainer, you can ignore this comment. Someone with commit access, please review this and clear it for Jenkins to run.

@ruflin

ruflin approved these changes May 22, 2017

@@ -108,15 +108,15 @@ package: update beats-dashboards
# build the dashboards package
echo "Start building the dashboards package"
mkdir -p build/upload/
BUILD_DIR=${shell pwd}/build SNAPSHOT=$(SNAPSHOT) $(MAKE) -C dev-tools/packer package-dashboards ${shell pwd}/build/upload/build_id.txt
BUILD_DIR=$(CURDIR)/build SNAPSHOT=$(SNAPSHOT) $(MAKE) -C dev-tools/packer package-dashboards $(CURDIR)/build/upload/build_id.txt

This comment has been minimized.

Copy link
@ruflin

ruflin May 22, 2017

Collaborator

I wonder if this has potential to break on any platforms? @andrewkroh thoughts?

This comment has been minimized.

Copy link
@andrewkroh

andrewkroh May 22, 2017

Member

I think that should be fine.

@ruflin ruflin merged commit 2c96a9c into elastic:master May 22, 2017

3 of 4 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
CLA Commit author has signed the CLA
Details
beats-ci Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.