--- src/Makefile.orig 2011-06-23 00:40:21.000000000 +0400 +++ src/Makefile 2011-06-29 16:27:24.000000000 +0400 @@ -9,6 +9,9 @@ CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6 CCLINK?= -ldl -lnsl -lsocket -lm -lpthread DEBUG?= -g -ggdb +else ifeq ($(uname_S),FreeBSD) + CFLAGS?= $(CFLAGS) + CCLINK?= -pthread -lm -L${PREFIX}/lib -llua-5.1 else CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) CCLINK?= -lm -pthread @@ -19,9 +22,9 @@ CCLINK+= -ltcmalloc CFLAGS+= -DUSE_TCMALLOC endif -CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) +CCOPT= $(CFLAGS) $(CCLINK) $(PROF) -PREFIX= /usr/local +PREFIX?= $(PREFIX) INSTALL_BIN= $(PREFIX)/bin INSTALL= cp -p @@ -109,10 +112,10 @@ dependencies: cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)" cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)" - cd ../deps/lua && $(MAKE) ARCH="$(ARCH)" ansi +# cd ../deps/lua && $(MAKE) ARCH="$(ARCH)" ansi redis-server: $(OBJ) - $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) ../deps/lua/src/liblua.a + $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) redis-benchmark: dependencies $(BENCHOBJ) cd ../deps/hiredis && $(MAKE) static