diff --git a/Makefile b/Makefile index 30697db17d6ed2677cd716089470122d9ddf6ef9..047ba8ed4148b86f6b99124f5d31b1f2f9d9fa8d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ install: lib-install modules-install daemon-install check: all tests clean: lib-clean modules-clean daemon-clean tests-clean doc-clean doc: doc-html -.PHONY: all install check clean doc +.PHONY: all install check clean doc info # Options ifdef COVERAGE diff --git a/config.mk b/config.mk index 009d9fa8cd620181d986c6f5ccde41ab4aeda43a..a59d8690581e4b125c883457a95302c0ac7329ab 100644 --- a/config.mk +++ b/config.mk @@ -1,7 +1,7 @@ # Project MAJOR := 1 MINOR := 0 -PATCH := 0-beta1 +PATCH := 0-beta2 # Paths PREFIX := /usr/local diff --git a/platform.mk b/platform.mk index a8d31bc4c9d93dfecc8f472ed5b262ab6e25ff31..f8a4450355519d5fe1b7eaa6412c485a6e3c1393 100644 --- a/platform.mk +++ b/platform.mk @@ -10,7 +10,7 @@ MODTYPE := shared ARTYPE := static BINEXT := PLATFORM = Linux -ARCH := +ARCH := $(word 1, $(subst -, ,$(shell $(CC) -dumpmachine))) ifeq ($(OS),Windows_NT) PLATFORM := Windows RM := del @@ -18,7 +18,6 @@ ifeq ($(OS),Windows_NT) LIBEXT := .lib BINEXT := .exe else - ARCH := $(shell uname -m) UNAME := $(shell uname -s) ifeq ($(UNAME),Darwin) PLATFORM := Darwin