--- Makefile.orig 2019-01-10 00:20:05 UTC +++ Makefile @@ -11,7 +11,7 @@ MAJOR=1 MINOR=31 RELEASE=$(MAJOR).$(MINOR) -CC = gcc +CC ?= gcc ifndef PREFIX PREFIX=/usr/local @@ -38,18 +38,21 @@ ifeq ($(ARCH),i686) ARCH = x86 endif -ifeq ($(ARCH),x86_64) +ifeq ($(ARCH),amd64) CFLAGS += -fPIC endif ifeq ($(OS_TYPE),CYGWIN) GC_CFLAGS += -L/usr/local/lib else -GC_CFLAGS += -I/usr/local/include -L/usr/local/lib +GC_CFLAGS += -I/usr/local/include endif ifdef D_USE_GC CFLAGS += -DUSE_GC ${GC_CFLAGS} +ifeq ($(OS_TYPE),FreeBSD) + LIBS += -L${LOCALBASE}/lib +endif LIBS += -lgc ifeq ($(OS_TYPE),Linux) LIBS += -ldl @@ -64,10 +67,10 @@ ifdef D_USE_FREELISTS CFLAGS += -DUSE_FREELISTS endif -D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1) -ifeq ($(D_BUILD_VERSION),) +#D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1) +#ifeq ($(D_BUILD_VERSION),) D_BUILD_VERSION = $(shell cat D_BUILD_VERSION) -endif +#endif CFLAGS += -DD_MAJOR_VERSION=$(MAJOR) -DD_MINOR_VERSION=$(MINOR) -DD_BUILD_VERSION=\"$(D_BUILD_VERSION)\" CFLAGS += -Wall @@ -143,7 +146,7 @@ endif ALL_SRCS = $(MAKE_PARSER_SRCS) $(BASE_SAMPLE_PARSER_SRCS) $(LIB_SRCS) $(MK_LIB_SRCS) -all: $(EXECS) $(LIBRARIES) D_BUILD_VERSION make_dparser.cat +all: $(EXECS) $(LIBRARIES) make_dparser.cat version: echo $(OS_TYPE) $(OS_VERSION)