From 889148a27a6863932f911c463bca737ec9a1cfef Mon Sep 17 00:00:00 2001 From: siddontang Date: Sun, 27 Jul 2014 07:01:01 +0800 Subject: [PATCH] update build --- Makefile | 4 ---- README.md | 10 +++++----- build_config.sh | 16 ---------------- 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100755 build_config.sh diff --git a/Makefile b/Makefile index 634de20..9ad1cae 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,5 @@ $(shell ./bootstrap.sh) -$(shell ./build_config.sh build_config.mk ./) - -include build_config.mk - all: build build: diff --git a/README.md b/README.md index 5bd261b..e25c978 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,13 @@ Create a workspace and checkout ledisdb source cd src/github.com/siddontang/ledisdb - make + source dev.sh && make ## LevelDB support + Install leveldb and snappy. - LedisDB supplies a simple shell to install leveldb and snappy: + LedisDB supplies a simple script to install leveldb and snappy: sh build_leveldb.sh @@ -42,17 +42,17 @@ Create a workspace and checkout ledisdb source + Set LEVELDB_DIR and SNAPPY_DIR to the actual install path in dev.sh. -+ ```make``` ++ ```source dev.sh && make``` ## RocksDB support + Install rocksdb and snappy first. - LedisDB has not supplied a simple shell to install, maybe it will later. + LedisDB has not supplied a simple script to install, maybe it will later. + Set ROCKSDB_DIR and SNAPPY_DIR to the actual install path in dev.sh. -+ ```make``` ++ ```source dev.sh && make``` ## Choose store database diff --git a/build_config.sh b/build_config.sh deleted file mode 100755 index ce52efd..0000000 --- a/build_config.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -OUTPUT=$1 -PREFIX=$2 -if test -z "$OUTPUT" || test -z "$PREFIX"; then - echo "usage: $0 " >&2 - exit 1 -fi - -# Delete existing output, if it exists -rm -f $OUTPUT -touch $OUTPUT - -source ./dev.sh - -echo "GO_BUILD_TAGS=$GO_BUILD_TAGS" >> $OUTPUT \ No newline at end of file