Skip to content
Snippets Groups Projects
Commit 57126ed5 authored by rswindell's avatar rswindell
Browse files

Remove extraneous white-space in previous commit.

Increment VERSION from 3.14 to 3.15 (not sure what this is used for).
parent 5015f090
Branches
Tags
No related merge requests found
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
# Set VERSION # Set VERSION
ifndef VERSION ifndef VERSION
VERSION := 3.14 VERSION := 3.15
endif endif
# Put local (optional) macro definitions in localdefs.mk # Put local (optional) macro definitions in localdefs.mk
...@@ -199,7 +199,7 @@ os := $(shell echo $(os) | tr '[A-Z]' '[a-z]' | tr ' ' '_') ...@@ -199,7 +199,7 @@ os := $(shell echo $(os) | tr '[A-Z]' '[a-z]' | tr ' ' '_')
machine := $(shell if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null; then uname -m | tr "[A-Z]" "[a-z]" | tr " " "_" ; fi) machine := $(shell if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null; then uname -m | tr "[A-Z]" "[a-z]" | tr " " "_" ; fi)
machine := $(shell if uname -m | egrep "64" > /dev/null; then uname -m | tr "[A-Z]" "[a-z]" | tr " " "_" ; else echo $(machine) ; fi) machine := $(shell if uname -m | egrep "64" > /dev/null; then uname -m | tr "[A-Z]" "[a-z]" | tr " " "_" ; else echo $(machine) ; fi)
ifeq ($(machine),x86_64) ifeq ($(machine),x86_64)
machine := x64 machine := x64
endif endif
CFLAGS += -fpic CFLAGS += -fpic
ifeq ($(machine),sparc64) ifeq ($(machine),sparc64)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment