mirror of
https://github.com/ValveSoftware/Proton.git
synced 2025-01-13 23:28:16 +03:00
build: Remove duplicate BUILD_DIR variable.
This commit is contained in:
parent
bb11c5177c
commit
5dd383efff
5
Makefile
5
Makefile
@ -13,8 +13,9 @@ endif
|
|||||||
# remove special chars
|
# remove special chars
|
||||||
override _build_name := $(shell echo $(_build_name) | tr -dc '[:alnum:] ._-')
|
override _build_name := $(shell echo $(_build_name) | tr -dc '[:alnum:] ._-')
|
||||||
|
|
||||||
|
# make doesn't handle spaces well... replace them with underscores in paths
|
||||||
|
BUILD_DIR := "build-$(shell echo $(_build_name) | sed -e 's/ /_/g')"
|
||||||
STEAM_DIR := $(HOME)/.steam/root
|
STEAM_DIR := $(HOME)/.steam/root
|
||||||
BUILD_DIR := $(_build_name)
|
|
||||||
|
|
||||||
ifeq ($(build_name),)
|
ifeq ($(build_name),)
|
||||||
DEPLOY_DIR := $(shell git describe --tags --always)
|
DEPLOY_DIR := $(shell git describe --tags --always)
|
||||||
@ -45,8 +46,6 @@ CONFIGURE_CMD := ../proton/configure.sh \
|
|||||||
--steam-runtime-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version) \
|
--steam-runtime-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version) \
|
||||||
--build-name="$(_build_name)"
|
--build-name="$(_build_name)"
|
||||||
|
|
||||||
# make doesn't handle spaces well... replace them with underscores in paths
|
|
||||||
BUILD_DIR := "build-$(shell echo $(_build_name) | sed -e 's/ /_/g')"
|
|
||||||
|
|
||||||
all: help
|
all: help
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user