github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46913 from xiangpengzhao/fix-make-help

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46913, 48910, 48858, 47160)

Fix "make help" info

**What this PR does / why we need it**:
fixes some incorrect help info

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #46911

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-25 23:00:28 -07:00 committed by GitHub
commit c29f6cb576
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/root/Makefile
View File

@ -425,7 +425,7 @@ define CMD_HELP_INFO
# make kubectl kube-proxy # make kubectl kube-proxy
endef endef
#TODO: make EXCLUDE_TARGET auto-generated when there are other files in cmd/ #TODO: make EXCLUDE_TARGET auto-generated when there are other files in cmd/
EXCLUDE_TARGET=OWNERS EXCLUDE_TARGET=BUILD OWNERS
.PHONY: $(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*/)))) .PHONY: $(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*/))))
ifeq ($(PRINT_HELP),y) ifeq ($(PRINT_HELP),y)
$(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*/)))): $(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*/)))):
@ -557,14 +557,14 @@ bazel-test-integration:
endif endif
ifeq ($(PRINT_HELP),y) ifeq ($(PRINT_HELP),y)
define BAZEL_BUILD_HELP_INFO define BAZEL_RELEASE_HELP_INFO
# Build release tars with bazel # Build release tars with bazel
# #
# Example: # Example:
# make bazel-release # make bazel-release
endef endef
bazel-release: bazel-release:
@echo "$$BAZEL_BUILD_HELP_INFO" @echo "$$BAZEL_RELEASE_HELP_INFO"
else else
bazel-release: bazel-release:
bazel build //build/release-tars bazel build //build/release-tars