diff options
author | zeripath <art27@cantab.net> | 2019-04-29 19:08:21 +0100 |
---|---|---|
committer | techknowlogick <techknowlogick@gitea.io> | 2019-04-29 14:08:21 -0400 |
commit | 8d0d7bc28d517acc9ca98f0468d7ff2a4fdaf139 (patch) | |
tree | 0a8817abd2512ca2ebccfd4e5dc08814933aad2b /Makefile | |
parent | ccf4783980effa871abaecd70d0f983c5062a187 (diff) | |
download | gitea-8d0d7bc28d517acc9ca98f0468d7ff2a4fdaf139.tar.gz gitea-8d0d7bc28d517acc9ca98f0468d7ff2a4fdaf139.zip |
Make CustomPath, CustomConf and AppWorkPath configurable at build (#6631)
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -9,9 +9,9 @@ SHASUM ?= shasum -a 256 export PATH := $($(GO) env GOPATH)/bin:$(PATH) ifeq ($(OS), Windows_NT) - EXECUTABLE := gitea.exe + EXECUTABLE ?= gitea.exe else - EXECUTABLE := gitea + EXECUTABLE ?= gitea UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Darwin) SED_INPLACE := sed -i '' @@ -39,7 +39,7 @@ else GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') endif -LDFLAGS := -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" +LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/))) SOURCES ?= $(shell find . -name "*.go" -type f) @@ -70,12 +70,6 @@ TEST_MSSQL_DBNAME ?= gitea TEST_MSSQL_USERNAME ?= sa TEST_MSSQL_PASSWORD ?= MwantsaSecurePassword1 -ifeq ($(OS), Windows_NT) - EXECUTABLE := gitea.exe -else - EXECUTABLE := gitea -endif - # $(call strip-suffix,filename) strip-suffix = $(firstword $(subst ., ,$(1))) |