diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-12 16:59:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-12 16:59:45 +0100 |
commit | ee27c39f85507993c0a3dfe3c4dfab4c7b7e5e00 (patch) | |
tree | 6e02056b44d75afb4cdb032c7772dab30bc1c26c /Makefile | |
parent | bdf537f4fc983c30c945297d9ee33891a127f9bd (diff) | |
parent | 2448129e4d27b95ce172f0ab5ac32c891aae7519 (diff) | |
download | podman-ee27c39f85507993c0a3dfe3c4dfab4c7b7e5e00.tar.gz podman-ee27c39f85507993c0a3dfe3c4dfab4c7b7e5e00.tar.bz2 podman-ee27c39f85507993c0a3dfe3c4dfab4c7b7e5e00.zip |
Merge pull request #2264 from larskarlitski/varlink-api
Make varlink API more idiomatic
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -34,7 +34,7 @@ SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo PACKAGES ?= $(shell $(GO) list -tags "${BUILDTAGS}" ./... | grep -v github.com/containers/libpod/vendor | grep -v e2e | grep -v system ) COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true) -GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}") +GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO}) BUILD_INFO ?= $(shell date +%s) LIBPOD := ${PROJECT}/libpod LDFLAGS_PODMAN ?= $(LDFLAGS) -X $(LIBPOD).gitCommit=$(GIT_COMMIT) -X $(LIBPOD).buildInfo=$(BUILD_INFO) |