commit 4109bb053906f45b545a6cca4399734b91bca425 Author: Julien Kauffmann Date: Sat May 9 16:55:51 2015 -0400 Fixed Makefile diff --git a/Makefile b/Makefile index d6bcd59..20b5ea1 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,15 @@ PRODUCT_NAME:=freelan -PRODUCT_VERSION:=$(shell git describe) +PRODUCT_VERSION:=$(shell cat VERSION | tr -d '\r\n') +PRODUCT_PREFIX=/usr -default: install - -install: - # Install the files to ${DESTDIR} (defaults to /) - scons install prefix=/ +default: build build: - scons all samples + FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX} + +install: + # Install the files to $(DESTDIR) (defaults to /) + FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX} package: git archive HEAD --prefix=${PRODUCT_NAME}-${PRODUCT_VERSION}/ | gzip > ${PRODUCT_NAME}-${PRODUCT_VERSION}.tar.gz