opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-13 02:24:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't shell to obtain current directory

Browse Source 
Instead of shelling out frequently to resolve the current
directory, use the Makefile built-in `$(CURDIR)`.  It has
the exact same meaning w/in the context of a `Makefile`.

Ref.:
https://www.gnu.org/software/make/manual/html_node/Quick-Reference.html

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2021-04-08 08:47:19 -04:00
parent 837bb9f492
commit 5a703bbf7a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -64,8 +64,8 @@ else
ISODATE ?= $(shell date --iso-8601) ISODATE ?= $(shell date --iso-8601)
endif endif
LIBPOD := ${PROJECT}/v3/libpod LIBPOD := ${PROJECT}/v3/libpod
GCFLAGS ?= all=-trimpath=${PWD} GCFLAGS ?= all=-trimpath=$(CURDIR)
ASMFLAGS ?= all=-trimpath=${PWD} ASMFLAGS ?= all=-trimpath=$(CURDIR)
LDFLAGS_PODMAN ?= \ LDFLAGS_PODMAN ?= \
-X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \ -X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \
-X $(LIBPOD)/define.buildInfo=$(BUILD_INFO) \ -X $(LIBPOD)/define.buildInfo=$(BUILD_INFO) \
@ -329,7 +329,7 @@ remoteintegration: test-binaries ginkgo-remote
localsystem: localsystem:
# Wipe existing config, database, and cache: start with clean slate. # Wipe existing config, database, and cache: start with clean slate.
$(RM) -rf ${HOME}/.local/share/containers ${HOME}/.config/containers $(RM) -rf ${HOME}/.local/share/containers ${HOME}/.config/containers
if timeout -v 1 true; then PODMAN=$(shell pwd)/bin/podman bats test/system/; else echo "Skipping $@: 'timeout -v' unavailable'"; fi if timeout -v 1 true; then PODMAN=$(CURDIR)/bin/podman bats test/system/; else echo "Skipping $@: 'timeout -v' unavailable'"; fi
.PHONY: remotesystem .PHONY: remotesystem
remotesystem: remotesystem:
@ -354,7 +354,7 @@ remotesystem:
echo "Error: ./bin/podman system service did not come up on $$SOCK_FILE" >&2;\ echo "Error: ./bin/podman system service did not come up on $$SOCK_FILE" >&2;\
exit 1;\ exit 1;\
fi;\ fi;\
env PODMAN="$(shell pwd)/bin/podman-remote --url $$PODMAN_SOCKET" bats test/system/ ;\ env PODMAN="$(CURDIR)/bin/podman-remote --url $$PODMAN_SOCKET" bats test/system/ ;\
rc=$$?;\ rc=$$?;\
kill %1;\ kill %1;\
rm -f $$SOCK_FILE;\ rm -f $$SOCK_FILE;\
@ -404,7 +404,7 @@ docs: $(MANPAGES) ## Generate documentation
install-podman-remote-%-docs: podman-remote docs $(MANPAGES) install-podman-remote-%-docs: podman-remote docs $(MANPAGES)
rm -rf docs/build/remote rm -rf docs/build/remote
mkdir -p docs/build/remote mkdir -p docs/build/remote
ln -sf $(shell pwd)/docs/source/markdown/links docs/build/man/ ln -sf $(CURDIR)/docs/source/markdown/links docs/build/man/
docs/remote-docs.sh $* docs/build/remote/$* $(if $(findstring windows,$*),docs/source/markdown,docs/build/man) docs/remote-docs.sh $* docs/build/remote/$* $(if $(findstring windows,$*),docs/source/markdown,docs/build/man)
.PHONY: man-page-check .PHONY: man-page-check
@ -678,7 +678,7 @@ vendor:
.PHONY: vendor-in-container .PHONY: vendor-in-container
vendor-in-container: vendor-in-container:
podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.16 make vendor podman run --privileged --rm --env HOME=/root -v $(CURDIR):/src -w /src docker.io/library/golang:1.16 make vendor
.PHONY: package .PHONY: package
package: ## Build rpm packages package: ## Build rpm packages