--- Makefile.orig 2017-03-07 17:20:10 UTC +++ Makefile @@ -26,7 +26,7 @@ # .PHONY: all depend clean lint doc doxygen check valgrind libdbl coverage -ARCH := $(shell uname -m | \ +ARCHX := $(shell uname -m | \ sed \ -e s/sun../sparc/ \ -e s/i.86/x86/ \ @@ -40,6 +40,7 @@ OSTYPE := $(shell uname -s tr '[:upper:]' '[:lower:]' | \ tr '/' '_' | \ sed \ + -e s/freebsd/linux/ \ -e s/cygwin.*/cygwin/ \ -e s/irix../irix/ \ -e s/windows.*/windows/ \ @@ -76,7 +77,7 @@ SRCDIR = src BINDIR = bin LIBDIR = lib -CPPFLAGS = -I$(SRCDIR) -DVERSION='"$(VERSION)"' +CPPFLAGS += -I$(SRCDIR) -DVERSION='"$(VERSION)"' CFLAGS = -O LDFLAGS = -lgmp -lm YFLAGS = -d -t -v @@ -102,10 +103,10 @@ ifeq ($(STATIC),true) LINK = static endif -BASE = $(OSTYPE).$(ARCH).$(COMP).$(OPT) -OBJDIR = obj/O.$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) +BASE = $(OSTYPE).$(ARCHX).$(COMP).$(OPT) +OBJDIR = obj/O.$(OSTYPE).$(ARCHX).$(COMP).$(LINK).$(OPT) NAME = zimpl -BINNAME = $(NAME)-$(VERSION).$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) +BINNAME = $(NAME)-$(VERSION).$(OSTYPE).$(ARCHX).$(COMP).$(LINK).$(OPT) LIBNAME = $(NAME)-$(VERSION).$(BASE) LIBRARY = $(LIBDIR)/lib$(LIBNAME)$(LIBEXT) @@ -140,7 +141,7 @@ OBJSRC = $(addprefix $(SRCDIR)/,$(OBJEC LIBSRC = $(addprefix $(SRCDIR)/,$(LIBOBJ:.o=.c)) #(SRCDIR)/numbdbl.c #----------------------------------------------------------------------------- -include make/make.$(OSTYPE).$(ARCH).$(COMP).$(OPT) +include make/make.$(OSTYPE).$(ARCHX).$(COMP).$(OPT) -include make/local/make.$(HOSTNAME) -include make/local/make.$(HOSTNAME).$(COMP) -include make/local/make.$(HOSTNAME).$(COMP).$(OPT)