diff --git a/Makefile b/Makefile index 711ef6ff7..576c0e5e9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Top level makefile, the real shit is at src/Makefile -TARGETS=32bit noopt +TARGETS=32bit noopt test install all: cd src && $(MAKE) $@ diff --git a/src/Makefile b/src/Makefile index a7cc6b9a7..0af70f174 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,6 +15,10 @@ endif CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) DEBUG?= -g -rdynamic -ggdb +INSTALL_TOP= /usr/local +INSTALL_BIN= $(INSTALL_TOP)/bin +INSTALL= cp -p + OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o linenoise.o @@ -109,3 +113,10 @@ noopt: 32bitgprof: make PROF="-pg" ARCH="-arch i386" + +install: all + $(INSTALL) $(PRGNAME) $(INSTALL_BIN) + $(INSTALL) $(BENCHPRGNAME) $(INSTALL_BIN) + $(INSTALL) $(CLIPRGNAME) $(INSTALL_BIN) + $(INSTALL) $(CHECKDUMPPRGNAME) $(INSTALL_BIN) + $(INSTALL) $(CHECKAOFPRGNAME) $(INSTALL_BIN)