From e192dcfc7748c4d8002b4545feeab80da403d449 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 13 Aug 2017 22:24:15 +0800 Subject: [PATCH 1/2] Makefile: allow PREFIX variables to be set from the environment only set to /usr/local if no value has been assigned yet --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5677b574..6dfa4dd2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PRODUCT_NAME:=freelan PRODUCT_VERSION:=$(shell cat VERSION | tr -d '\r\n') -PRODUCT_BIN_PREFIX=/usr/local -PRODUCT_PREFIX=/usr/local +PRODUCT_BIN_PREFIX?=/usr/local +PRODUCT_PREFIX?=/usr/local default: build From 540ed7f939c92d0c3ca812c525ff576ebbe7705a Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 13 Aug 2017 22:31:24 +0800 Subject: [PATCH 2/2] Makefile: simplify call for "make package" --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6dfa4dd2..7acf0450 100644 --- a/Makefile +++ b/Makefile @@ -13,4 +13,4 @@ install: FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX} package: - git archive HEAD --prefix=${PRODUCT_NAME}-${PRODUCT_VERSION}/ | gzip > ${PRODUCT_NAME}-${PRODUCT_VERSION}.tar.gz + git archive HEAD --prefix=${PRODUCT_NAME}-${PRODUCT_VERSION}/ -o ${PRODUCT_NAME}-${PRODUCT_VERSION}.tar.gz