From 369299dbca49be3d907b9a6ebcf011d97a013198 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Thu, 1 Apr 2021 17:02:10 +0200 Subject: [PATCH] Makefile: rename build artifact for windows and darwin Rename `podman-remote` to `podman.exe` on Windows and to `podman` on Mac OS. The `-remote` suffix isn't needed since Podman does not run natively on these systems. Signed-off-by: Valentin Rothberg --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 705ac4ded5..d296a1954e 100644 --- a/Makefile +++ b/Makefile @@ -228,8 +228,8 @@ podman.msi: podman-remote podman-remote-windows install-podman-remote-windows-do wixl -D VERSION=$(RELEASE_NUMBER) -D ManSourceDir=$(DOCFILE) -o podman-v$(RELEASE_NUMBER).msi contrib/msi/podman.wxs $(DOCFILE)/pages.wsx podman-remote-%: .gopathok ## Build podman for a specific GOOS - $(eval BINSFX := $(shell test "$*" != "windows" || echo ".exe")) - CGO_ENABLED=0 GOOS=$* $(GO) build $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "${REMOTETAGS}" -o bin/$@$(BINSFX) ./cmd/podman + $(eval BINSFX := $(shell if [ "$*" == "windows" ]; then echo "podman.exe"; elif [ "$*" == "darwin" ]; then echo "podman"; else echo "podman-remote"; fi)) + CGO_ENABLED=0 GOOS=$* $(GO) build $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "${REMOTETAGS}" -o bin/$(BINSFX) ./cmd/podman local-cross: $(CROSS_BUILD_TARGETS) ## Cross local compilation @@ -449,11 +449,11 @@ podman-remote-release-%.zip: RELEASE_DIST=$* RELEASE_DIST_VER="-" $(eval TMPDIR := $(shell mktemp -d -p '' $podman_remote_XXXX)) $(eval SUBDIR := podman-$(RELEASE_VERSION)) - $(eval BINSFX := $(shell test "$*" != "windows" || echo ".exe")) + $(eval BINSFX := $(shell if [ "$*" == "windows" ]; then echo "podman.exe"; elif [ "$*" == "darwin" ]; then echo "podman"; else echo "podman-remote"; fi)) mkdir -p "$(TMPDIR)/$(SUBDIR)" # release.txt location and content depended upon by automated tooling cp release.txt "$(TMPDIR)/" - cp ./bin/podman-remote-$*$(BINSFX) "$(TMPDIR)/$(SUBDIR)/podman$(BINSFX)" + cp ./bin/$(BINSFX) "$(TMPDIR)/$(SUBDIR)/podman$(BINSFX)" cp -r ./docs/build/remote/$* "$(TMPDIR)/$(SUBDIR)/docs/" cp ./contrib/remote/containers.conf "$(TMPDIR)/$(SUBDIR)/" cd "$(TMPDIR)/$(SUBDIR)" && \